From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5527CC3ABC3 for ; Fri, 9 May 2025 12:23:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=b6yRNiv/JQSk8EiU8NvqiCbkDLAiLPcMgtrnjc11Ssg=; b=GwQ8z6OMF7/Vkh Ed35WYShYUBqkXENY7/WAOtiXeR8eDQaPYkWnmkHOXnieXWvYAeKcxdi6MaV9v2lV8U+gbGH2OJqc Sr0E3VLFzJOFOCW0GH122fDMVv4yqjtDdu2LuYH/xq6NkdoU4BsQckdKs2Ubg+u9wf8GKhA1glIRQ iIwOwII6ZtKikM31eusv4M4TL0xmjhItNN4eAdkE01z8jdZpHvn7YCEaL+wsTP99QAqu1pAMvOyDH wD8/3BKB1T5P4I/trIKxLNDv+tjqcE3mpdbAfaXY4RgXMiXvS8dy8Z2OfnZywdKTw4bNiFDKqyNeN KsKXMtAqi94OVLl0gEUQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uDMlM-00000003ZPm-2Xid; Fri, 09 May 2025 12:23:36 +0000 Received: from mail-il1-x134.google.com ([2607:f8b0:4864:20::134]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uDLmV-00000003Ppv-1UO8 for linux-riscv@lists.infradead.org; Fri, 09 May 2025 11:20:44 +0000 Received: by mail-il1-x134.google.com with SMTP id e9e14a558f8ab-3d9327d0720so17858795ab.3 for ; Fri, 09 May 2025 04:20:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1746789642; x=1747394442; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ALLcarQNFDeeiNyZCIkx4Oh+0h6y7K/lB/3yo0qpRaY=; b=slVcL4TujyniTV6EJO2aByhzRWVSbS6jCGAJ9UmEu7UvC8v9xwRQc4GRlYfUNFUi6c D6frDMSg2lJ5F652oi/kjsu2DbT2kRS9Gax9jWkJQpaAaPV0KhEN+CpjxqX3BQ+aUub/ 2GpUiqPOosNh0MnJT7S6rwpNRWUtbIxF8vRxgn5m+HWLZLKG3reoTXhJNF6ScQpRk92I fw/LKpskqf81x0AMxSAZ5bDhYZEWxdG31uytpkVxd/A7ZEXC8np6xkPC4pjOLWq2zhh+ AkOfbHaEw1BNhBja58j8UuRbNnLrvKtT0JH+Lqmr0d0M+qEJflJOYRSKRrbh3uo+Dabe bOXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746789642; x=1747394442; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ALLcarQNFDeeiNyZCIkx4Oh+0h6y7K/lB/3yo0qpRaY=; b=U2vP+OKcUnZzi/0tjLhRHd0ViaFL93xwuLbTt7sgdE5d0VjRYiaZKgLEbW3SuyI8YC EMlfGB5M5eNwPFxLj+wxGgIiiMw0vZeLY5VfzTIg0UnjEGS37GblHsXrOB4ZQKAKuK1v Qq+OXLIEH0uyuagBfZnv52P2jQb2SKSjiFRHR4hwl+x3iukfEdHMXNxBwR15g1OA8fPZ rj+Vpoe4Pi5ZOvHLPELQocZkEUqZcOkG9qGyaoF7k7mvgOJjm4U882al9Gdydpb4vmhv CClLH5j/tavbl2vf6Vti+kZBH9+W0qx19TomxsaQ0O2O9X/5Cb/AiYw/B/3asRWu1f0w CQ3g== X-Forwarded-Encrypted: i=1; AJvYcCU1UVV+GI8fU4xlOimiYzaZy6gqewSC2hRwrs1ubjJHYCSSsGQOKD4exf4ngMVJ1J4FDkIVQEG3lm9B7Q==@lists.infradead.org X-Gm-Message-State: AOJu0YwyJ/11HHUrTiOuhwzlY0IPTiPCMSEzo7pashPL6iu1z9AxBsdt YSt5eonTXrTxeCAvJKBmO7km+s8mUO/f5hKMrppSgYEg10qjU5V/oJpF+OWCkec= X-Gm-Gg: ASbGncsKMPLVahS98L0ortArM+wn86GMSkZ7HSLIry6qspTcFgMJcSiqlMWvV8pv5qx RWNke764ieyopsZryd/gB4hd8UTx3sFxeXTfv+jrWkNOe4NRv+pWBhl0/bbfj+mUw9yz1ZmM582 JM5SHvYlznw8KCU3pKaX4P31riuMsScF1dvADkj1sN1ZkVIEHqGAr38PeqrI/nS0UGHv0nTZCeP PHCc9ZIZcBaMk/Yaaov7sTI1KKFsb9+t8JcdYj7eIg/iobobe0kKj/mF9r7Y0+09e4PgqMcCXWs zonx9AHvPjQJxkg1w9qvzEQ8k1aeYwF50B5Lonh6k4TMJU6mXXn73vGNWHl2KP61XSQxtcTibxT BVmuB9+qRGEUfBtcrrU1V9t42 X-Google-Smtp-Source: AGHT+IGaOzNNGziKbcAaE+WJE3Mqb2ZE3yzP4LVo1rEGwpjX2+uYXY1PsrPJ0vfJTdsAfE1fkWsrfw== X-Received: by 2002:a05:6e02:1fc6:b0:3d8:2085:a188 with SMTP id e9e14a558f8ab-3da7e1e2709mr38555745ab.1.1746789642222; Fri, 09 May 2025 04:20:42 -0700 (PDT) Received: from localhost.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3da7e10549fsm5136325ab.23.2025.05.09.04.20.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 04:20:41 -0700 (PDT) From: Alex Elder To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, mturquette@baylibre.com, sboyd@kernel.org, p.zabel@pengutronix.de, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, dlan@gentoo.org Cc: heylenay@4d2.org, inochiama@outlook.com, guodong@riscstar.com, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, spacemit@lists.linux.dev, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 3/6] clk: spacemit: set up reset auxiliary devices Date: Fri, 9 May 2025 06:20:28 -0500 Message-ID: <20250509112032.2980811-4-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250509112032.2980811-1-elder@riscstar.com> References: <20250509112032.2980811-1-elder@riscstar.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250509_042043_393187_22EB47A2 X-CRM114-Status: GOOD ( 23.54 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Add a new reset_name field to the spacemit_ccu_data structure. If it is non-null, the CCU implements a reset controller, and the name will be used in the name for the auxiliary device that implements it. Define a new type to hold an auxiliary device as well as the regmap pointer that will be needed by CCU reset controllers. Set up code to initialize and add an auxiliary device for any CCU that implements reset functionality. Make it optional for a CCU to implement a clock controller. This doesn't apply to any of the existing CCUs but will for some new ones that will be added soon. Signed-off-by: Alex Elder --- v8: Allocate the auxiliary device using kzalloc(), not devm_kzalloc() drivers/clk/spacemit/Kconfig | 1 + drivers/clk/spacemit/ccu-k1.c | 90 ++++++++++++++++++++++++++++---- include/soc/spacemit/k1-syscon.h | 12 +++++ 3 files changed, 93 insertions(+), 10 deletions(-) diff --git a/drivers/clk/spacemit/Kconfig b/drivers/clk/spacemit/Kconfig index 4c4df845b3cb2..3854f6ae6d0ea 100644 --- a/drivers/clk/spacemit/Kconfig +++ b/drivers/clk/spacemit/Kconfig @@ -3,6 +3,7 @@ config SPACEMIT_CCU tristate "Clock support for SpacemiT SoCs" depends on ARCH_SPACEMIT || COMPILE_TEST + select AUXILIARY_BUS select MFD_SYSCON help Say Y to enable clock controller unit support for SpacemiT SoCs. diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c index 801150f4ff0f5..551df9d076859 100644 --- a/drivers/clk/spacemit/ccu-k1.c +++ b/drivers/clk/spacemit/ccu-k1.c @@ -5,12 +5,14 @@ */ #include +#include #include #include #include #include #include #include +#include #include #include "ccu_common.h" @@ -21,6 +23,7 @@ #include struct spacemit_ccu_data { + const char *reset_name; struct clk_hw **hws; size_t num; }; @@ -710,8 +713,9 @@ static struct clk_hw *k1_ccu_pll_hws[] = { }; static const struct spacemit_ccu_data k1_ccu_pll_data = { - .hws = k1_ccu_pll_hws, - .num = ARRAY_SIZE(k1_ccu_pll_hws), + /* The PLL CCU implements no resets */ + .hws = k1_ccu_pll_hws, + .num = ARRAY_SIZE(k1_ccu_pll_hws), }; static struct clk_hw *k1_ccu_mpmu_hws[] = { @@ -751,8 +755,9 @@ static struct clk_hw *k1_ccu_mpmu_hws[] = { }; static const struct spacemit_ccu_data k1_ccu_mpmu_data = { - .hws = k1_ccu_mpmu_hws, - .num = ARRAY_SIZE(k1_ccu_mpmu_hws), + .reset_name = "mpmu-reset", + .hws = k1_ccu_mpmu_hws, + .num = ARRAY_SIZE(k1_ccu_mpmu_hws), }; static struct clk_hw *k1_ccu_apbc_hws[] = { @@ -859,8 +864,9 @@ static struct clk_hw *k1_ccu_apbc_hws[] = { }; static const struct spacemit_ccu_data k1_ccu_apbc_data = { - .hws = k1_ccu_apbc_hws, - .num = ARRAY_SIZE(k1_ccu_apbc_hws), + .reset_name = "apbc-reset", + .hws = k1_ccu_apbc_hws, + .num = ARRAY_SIZE(k1_ccu_apbc_hws), }; static struct clk_hw *k1_ccu_apmu_hws[] = { @@ -929,8 +935,9 @@ static struct clk_hw *k1_ccu_apmu_hws[] = { }; static const struct spacemit_ccu_data k1_ccu_apmu_data = { - .hws = k1_ccu_apmu_hws, - .num = ARRAY_SIZE(k1_ccu_apmu_hws), + .reset_name = "apmu-reset", + .hws = k1_ccu_apmu_hws, + .num = ARRAY_SIZE(k1_ccu_apmu_hws), }; static int spacemit_ccu_register(struct device *dev, @@ -941,6 +948,10 @@ static int spacemit_ccu_register(struct device *dev, struct clk_hw_onecell_data *clk_data; int i, ret; + /* Nothing to do if the CCU does not implement any clocks */ + if (!data->hws) + return 0; + clk_data = devm_kzalloc(dev, struct_size(clk_data, hws, data->num), GFP_KERNEL); if (!clk_data) @@ -981,9 +992,63 @@ static int spacemit_ccu_register(struct device *dev, return ret; } +static void spacemit_cadev_release(struct device *dev) +{ + struct auxiliary_device *adev = to_auxiliary_dev(dev); + + kfree(to_spacemit_ccu_adev(adev)); +} + +static void spacemit_adev_unregister(void *data) +{ + struct auxiliary_device *adev = data; + + auxiliary_device_delete(adev); + auxiliary_device_uninit(adev); +} + +static int spacemit_ccu_reset_register(struct device *dev, + struct regmap *regmap, + const char *reset_name) +{ + struct spacemit_ccu_adev *cadev; + struct auxiliary_device *adev; + static u32 next_id; + int ret; + + /* Nothing to do if the CCU does not implement a reset controller */ + if (!reset_name) + return 0; + + cadev = kzalloc(sizeof(*cadev), GFP_KERNEL); + if (!cadev) + return -ENOMEM; + cadev->regmap = regmap; + + adev = &cadev->adev; + adev->name = reset_name; + adev->dev.parent = dev; + adev->dev.release = spacemit_cadev_release; + adev->dev.of_node = dev->of_node; + adev->id = next_id++; + + ret = auxiliary_device_init(adev); + if (ret) + return ret; + + ret = auxiliary_device_add(adev); + if (ret) { + auxiliary_device_uninit(adev); + return ret; + } + + return devm_add_action_or_reset(dev, spacemit_adev_unregister, adev); +} + static int k1_ccu_probe(struct platform_device *pdev) { struct regmap *base_regmap, *lock_regmap = NULL; + const struct spacemit_ccu_data *data; struct device *dev = &pdev->dev; int ret; @@ -1012,11 +1077,16 @@ static int k1_ccu_probe(struct platform_device *pdev) "failed to get lock regmap\n"); } - ret = spacemit_ccu_register(dev, base_regmap, lock_regmap, - of_device_get_match_data(dev)); + data = of_device_get_match_data(dev); + + ret = spacemit_ccu_register(dev, base_regmap, lock_regmap, data); if (ret) return dev_err_probe(dev, ret, "failed to register clocks\n"); + ret = spacemit_ccu_reset_register(dev, base_regmap, data->reset_name); + if (ret) + return dev_err_probe(dev, ret, "failed to register resets\n"); + return 0; } diff --git a/include/soc/spacemit/k1-syscon.h b/include/soc/spacemit/k1-syscon.h index 039a448c51a07..53eff7691f33d 100644 --- a/include/soc/spacemit/k1-syscon.h +++ b/include/soc/spacemit/k1-syscon.h @@ -5,6 +5,18 @@ #ifndef __SOC_K1_SYSCON_H__ #define __SOC_K1_SYSCON_H__ +/* Auxiliary device used to represent a CCU reset controller */ +struct spacemit_ccu_adev { + struct auxiliary_device adev; + struct regmap *regmap; +}; + +static inline struct spacemit_ccu_adev * +to_spacemit_ccu_adev(struct auxiliary_device *adev) +{ + return container_of(adev, struct spacemit_ccu_adev, adev); +} + /* APBS register offset */ #define APBS_PLL1_SWCR1 0x100 #define APBS_PLL1_SWCR2 0x104 -- 2.45.2 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv