From nobody Tue Feb 10 11:14:51 2026 Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ABA2E24C06A; Sat, 20 Dec 2025 01:11:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766193108; cv=none; b=WW90Buu02k6sI81960tHZ4H/6ad6KhRPDIvEHRSkyX9FTjoCrpSqc6zUMTni0hxT2DwQkAEuk2ASFkQfjmtL/ZNGoB+EdcxLYUJPy3Uv0t10BL7eSfu6orNCjKLHPM9/WOt4oPfUkQavaSfCvwDqhsjN73A0T2HfySOv8H0brso= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766193108; c=relaxed/simple; bh=vC0A71HZzR2oqXG966TnBLiH0QsoMAHuHxqGDks7SM0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Hx8hPCsITDX+zzrU2NWggo47rlRdtl+z4RRaZQmOUznNjdL9D0pux+ohqiqcsXf+0uffqAgYuHspMj6kkXzG41W/M/BbiweKtYFsj90fZ39BaxH/Rra6V/Niws0JxOOKkRxL1DfruwqlaqqIPEqYTpdYoGRfLpI+8AISKE2uURk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gentoo.org; spf=pass smtp.mailfrom=gentoo.org; arc=none smtp.client-ip=140.211.166.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gentoo.org Received: from [127.0.0.1] (unknown [116.232.18.222]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dlan) by smtp.gentoo.org (Postfix) with ESMTPSA id 6D8D9341051; Sat, 20 Dec 2025 01:11:42 +0000 (UTC) From: Yixun Lan Date: Sat, 20 Dec 2025 09:11:19 +0800 Subject: [PATCH 1/2] clk: spacemit: extract common ccu functions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251220-06-k1-clk-common-v1-1-df28a0a91621@gentoo.org> References: <20251220-06-k1-clk-common-v1-0-df28a0a91621@gentoo.org> In-Reply-To: <20251220-06-k1-clk-common-v1-0-df28a0a91621@gentoo.org> To: Stephen Boyd , Michael Turquette , Philipp Zabel Cc: Alex Elder , Guodong Xu , Inochi Amaoto , linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-riscv@lists.infradead.org, spacemit@lists.linux.dev, Yixun Lan , Yao Zi X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=13643; i=dlan@gentoo.org; h=from:subject:message-id; bh=vC0A71HZzR2oqXG966TnBLiH0QsoMAHuHxqGDks7SM0=; b=owEB6QIW/ZANAwAKATGq6kdZTbvtAcsmYgBpRffDMmqozbXKr/nW2dl6e7qjQULfZXCE9VyTT f/F0TAQ0JWJAq8EAAEKAJkWIQS1urjJwxtxFWcCI9wxqupHWU277QUCaUX3wxsUgAAAAAAEAA5t YW51MiwyLjUrMS4xMSwyLDJfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5 maWZ0aGhvcnNlbWFuLm5ldEI1QkFCOEM5QzMxQjcxMTU2NzAyMjNEQzMxQUFFQTQ3NTk0REJCRU QACgkQMarqR1lNu+0bOw/7B88ycMPdrgsz4sQ2xhcSwQ6JbU+hMPz/KCi+vEeGdpG6RwywqE6kW OrMUaGV20tWwAeNS6BwEI2cPXG1ucB/bvwU53QqZWtdZzUQbO1JWfjhPs1qr+idQTa/+HymPb3v /WnEpFEVa6tEVN1MhPBpaca40kLAivKan8rIQ8NIwi1ulIAKrCmN2EYrA6vrVoWj82vx556/Stp ilaNgVHRA3LAu9GAfPj23raE/YVsKK2LT8uoztI9Tld/Q5p1ZKstEzc35Eia0FfyTFPxF9YLHDF 5Ah7+JOKHo2vH86C35g+cqVawxl0/jL4BYMEB4wjxkWqiNAjqlG98J/xAoN+Mo7DBFKC2gdOb1x JugUW0CuDs4tku+X3yhgziugYLLVKtj+M0RivXXtdhbX2Hxstv6FtrKbhFHYyPE/PFSRGcNbmVv dwJrAMukOKU4xMtOeMF4wkbXZh3Zyc33TlhfiSqcYq4GC4nLMzIZrjIbrpC4xxzoE+15SqCuyS1 k8k41zjiToHZ/MnKX5teXuQ5dTWQNSg9EZhtOHVYOVvv9sNbWdmR6y4tAjZqOhf1LX2R3bp7aLB F6UDyOjDRaBqK7wIUhz1Ur2G56I+PrUXTg/dWQxa3PiGPcgrI/AwRWSI4Fbwcdgr5dFry/X35MX Kghm6vgA9hzis9fW4YaAlvNt0xSg74= X-Developer-Key: i=dlan@gentoo.org; a=openpgp; fpr=50B03A1A5CBCD33576EF8CD7920C0DBCAABEFD55 Refactor the probe function of SpacemiT's clock, and extract a common ccu file, so new clock driver added in the future can share the same code, which would lower the burden of maintenance. Since this commit changes the module name where the auxiliary device registered, the auxiliary device id need to be adjusted. Idea of the patch is come from review of K3 clock driver, please refer this disucssion [1]. Link: https://lore.kernel.org/all/aTo8sCPpVM1o9PKX@pie/ [1] Suggested-by: Yao Zi Signed-off-by: Yixun Lan --- drivers/clk/spacemit/ccu-k1.c | 176 +---------------------------------= ---- drivers/clk/spacemit/ccu_common.c | 171 ++++++++++++++++++++++++++++++++++= ++ drivers/clk/spacemit/ccu_common.h | 10 +++ include/soc/spacemit/ccu.h | 21 +++++ include/soc/spacemit/k1-syscon.h | 12 +-- 5 files changed, 204 insertions(+), 186 deletions(-) diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c index 01d9485b615d..8627a0c292e9 100644 --- a/drivers/clk/spacemit/ccu-k1.c +++ b/drivers/clk/spacemit/ccu-k1.c @@ -5,15 +5,10 @@ */ =20 #include -#include #include -#include -#include -#include #include #include #include -#include #include =20 #include "ccu_common.h" @@ -23,14 +18,6 @@ =20 #include =20 -struct spacemit_ccu_data { - const char *reset_name; - struct clk_hw **hws; - size_t num; -}; - -static DEFINE_IDA(auxiliary_ids); - /* APBS clocks start, APBS region contains and only contains all PLL clock= s */ =20 /* @@ -1001,167 +988,6 @@ static const struct spacemit_ccu_data k1_ccu_apbc2_d= ata =3D { .reset_name =3D "apbc2-reset", }; =20 -static int spacemit_ccu_register(struct device *dev, - struct regmap *regmap, - struct regmap *lock_regmap, - const struct spacemit_ccu_data *data) -{ - 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 =3D devm_kzalloc(dev, struct_size(clk_data, hws, data->num), - GFP_KERNEL); - if (!clk_data) - return -ENOMEM; - - clk_data->num =3D data->num; - - for (i =3D 0; i < data->num; i++) { - struct clk_hw *hw =3D data->hws[i]; - struct ccu_common *common; - const char *name; - - if (!hw) { - clk_data->hws[i] =3D ERR_PTR(-ENOENT); - continue; - } - - name =3D hw->init->name; - - common =3D hw_to_ccu_common(hw); - common->regmap =3D regmap; - common->lock_regmap =3D lock_regmap; - - ret =3D devm_clk_hw_register(dev, hw); - if (ret) { - dev_err(dev, "Cannot register clock %d - %s\n", - i, name); - return ret; - } - - clk_data->hws[i] =3D hw; - } - - ret =3D devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, clk_data); - if (ret) - dev_err(dev, "failed to add clock hardware provider (%d)\n", ret); - - return ret; -} - -static void spacemit_cadev_release(struct device *dev) -{ - struct auxiliary_device *adev =3D to_auxiliary_dev(dev); - - ida_free(&auxiliary_ids, adev->id); - kfree(to_spacemit_ccu_adev(adev)); -} - -static void spacemit_adev_unregister(void *data) -{ - struct auxiliary_device *adev =3D 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; - int ret; - - /* Nothing to do if the CCU does not implement a reset controller */ - if (!reset_name) - return 0; - - cadev =3D kzalloc(sizeof(*cadev), GFP_KERNEL); - if (!cadev) - return -ENOMEM; - - cadev->regmap =3D regmap; - - adev =3D &cadev->adev; - adev->name =3D reset_name; - adev->dev.parent =3D dev; - adev->dev.release =3D spacemit_cadev_release; - adev->dev.of_node =3D dev->of_node; - ret =3D ida_alloc(&auxiliary_ids, GFP_KERNEL); - if (ret < 0) - goto err_free_cadev; - adev->id =3D ret; - - ret =3D auxiliary_device_init(adev); - if (ret) - goto err_free_aux_id; - - ret =3D auxiliary_device_add(adev); - if (ret) { - auxiliary_device_uninit(adev); - return ret; - } - - return devm_add_action_or_reset(dev, spacemit_adev_unregister, adev); - -err_free_aux_id: - ida_free(&auxiliary_ids, adev->id); -err_free_cadev: - kfree(cadev); - - return ret; -} - -static int k1_ccu_probe(struct platform_device *pdev) -{ - struct regmap *base_regmap, *lock_regmap =3D NULL; - const struct spacemit_ccu_data *data; - struct device *dev =3D &pdev->dev; - int ret; - - base_regmap =3D device_node_to_regmap(dev->of_node); - if (IS_ERR(base_regmap)) - return dev_err_probe(dev, PTR_ERR(base_regmap), - "failed to get regmap\n"); - - /* - * The lock status of PLLs locate in MPMU region, while PLLs themselves - * are in APBS region. Reference to MPMU syscon is required to check PLL - * status. - */ - if (of_device_is_compatible(dev->of_node, "spacemit,k1-pll")) { - struct device_node *mpmu =3D of_parse_phandle(dev->of_node, - "spacemit,mpmu", 0); - if (!mpmu) - return dev_err_probe(dev, -ENODEV, - "Cannot parse MPMU region\n"); - - lock_regmap =3D device_node_to_regmap(mpmu); - of_node_put(mpmu); - - if (IS_ERR(lock_regmap)) - return dev_err_probe(dev, PTR_ERR(lock_regmap), - "failed to get lock regmap\n"); - } - - data =3D of_device_get_match_data(dev); - - ret =3D spacemit_ccu_register(dev, base_regmap, lock_regmap, data); - if (ret) - return dev_err_probe(dev, ret, "failed to register clocks\n"); - - ret =3D 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; -} - static const struct of_device_id of_k1_ccu_match[] =3D { { .compatible =3D "spacemit,k1-pll", @@ -1200,7 +1026,7 @@ static struct platform_driver k1_ccu_driver =3D { .name =3D "spacemit,k1-ccu", .of_match_table =3D of_k1_ccu_match, }, - .probe =3D k1_ccu_probe, + .probe =3D spacemit_ccu_probe, }; module_platform_driver(k1_ccu_driver); =20 diff --git a/drivers/clk/spacemit/ccu_common.c b/drivers/clk/spacemit/ccu_c= ommon.c index 4412c4104dab..f1a837aafb46 100644 --- a/drivers/clk/spacemit/ccu_common.c +++ b/drivers/clk/spacemit/ccu_common.c @@ -1,6 +1,177 @@ // SPDX-License-Identifier: GPL-2.0-only =20 +#include +#include +#include #include +#include +#include +#include + +#include "ccu_common.h" + +static DEFINE_IDA(auxiliary_ids); +static int spacemit_ccu_register(struct device *dev, + struct regmap *regmap, + struct regmap *lock_regmap, + const struct spacemit_ccu_data *data) +{ + 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 =3D devm_kzalloc(dev, struct_size(clk_data, hws, data->num), + GFP_KERNEL); + if (!clk_data) + return -ENOMEM; + + clk_data->num =3D data->num; + + for (i =3D 0; i < data->num; i++) { + struct clk_hw *hw =3D data->hws[i]; + struct ccu_common *common; + const char *name; + + if (!hw) { + clk_data->hws[i] =3D ERR_PTR(-ENOENT); + continue; + } + + name =3D hw->init->name; + + common =3D hw_to_ccu_common(hw); + common->regmap =3D regmap; + common->lock_regmap =3D lock_regmap; + + ret =3D devm_clk_hw_register(dev, hw); + if (ret) { + dev_err(dev, "Cannot register clock %d - %s\n", + i, name); + return ret; + } + + clk_data->hws[i] =3D hw; + } + + ret =3D devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, clk_data); + if (ret) + dev_err(dev, "failed to add clock hardware provider (%d)\n", ret); + + return ret; +} + +static void spacemit_cadev_release(struct device *dev) +{ + struct auxiliary_device *adev =3D to_auxiliary_dev(dev); + + ida_free(&auxiliary_ids, adev->id); + kfree(to_spacemit_ccu_adev(adev)); +} + +static void spacemit_adev_unregister(void *data) +{ + struct auxiliary_device *adev =3D 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; + int ret; + + /* Nothing to do if the CCU does not implement a reset controller */ + if (!reset_name) + return 0; + + cadev =3D kzalloc(sizeof(*cadev), GFP_KERNEL); + if (!cadev) + return -ENOMEM; + + cadev->regmap =3D regmap; + + adev =3D &cadev->adev; + adev->name =3D reset_name; + adev->dev.parent =3D dev; + adev->dev.release =3D spacemit_cadev_release; + adev->dev.of_node =3D dev->of_node; + ret =3D ida_alloc(&auxiliary_ids, GFP_KERNEL); + if (ret < 0) + goto err_free_cadev; + adev->id =3D ret; + + ret =3D auxiliary_device_init(adev); + if (ret) + goto err_free_aux_id; + + ret =3D auxiliary_device_add(adev); + if (ret) { + auxiliary_device_uninit(adev); + return ret; + } + + return devm_add_action_or_reset(dev, spacemit_adev_unregister, adev); + +err_free_aux_id: + ida_free(&auxiliary_ids, adev->id); +err_free_cadev: + kfree(cadev); + + return ret; +} + +int spacemit_ccu_probe(struct platform_device *pdev) +{ + struct regmap *base_regmap, *lock_regmap =3D NULL; + const struct spacemit_ccu_data *data; + struct device *dev =3D &pdev->dev; + int ret; + + base_regmap =3D device_node_to_regmap(dev->of_node); + if (IS_ERR(base_regmap)) + return dev_err_probe(dev, PTR_ERR(base_regmap), + "failed to get regmap\n"); + + /* + * The lock status of PLLs locate in MPMU region, while PLLs themselves + * are in APBS region. Reference to MPMU syscon is required to check PLL + * status. + */ + if (of_device_is_compatible(dev->of_node, "spacemit,k1-pll")) { + struct device_node *mpmu =3D of_parse_phandle(dev->of_node, + "spacemit,mpmu", 0); + if (!mpmu) + return dev_err_probe(dev, -ENODEV, + "Cannot parse MPMU region\n"); + + lock_regmap =3D device_node_to_regmap(mpmu); + of_node_put(mpmu); + + if (IS_ERR(lock_regmap)) + return dev_err_probe(dev, PTR_ERR(lock_regmap), + "failed to get lock regmap\n"); + } + + data =3D of_device_get_match_data(dev); + + ret =3D spacemit_ccu_register(dev, base_regmap, lock_regmap, data); + if (ret) + return dev_err_probe(dev, ret, "failed to register clocks\n"); + + ret =3D 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; +} +EXPORT_SYMBOL_NS_GPL(spacemit_ccu_probe, "CLK_SPACEMIT"); =20 MODULE_DESCRIPTION("SpacemiT CCU common clock driver"); MODULE_LICENSE("GPL"); diff --git a/drivers/clk/spacemit/ccu_common.h b/drivers/clk/spacemit/ccu_c= ommon.h index da72f3836e0b..9b4ef24875e5 100644 --- a/drivers/clk/spacemit/ccu_common.h +++ b/drivers/clk/spacemit/ccu_common.h @@ -7,6 +7,8 @@ #ifndef _CCU_COMMON_H_ #define _CCU_COMMON_H_ =20 +#include +#include #include =20 struct ccu_common { @@ -36,6 +38,12 @@ static inline struct ccu_common *hw_to_ccu_common(struct= clk_hw *hw) return container_of(hw, struct ccu_common, hw); } =20 +struct spacemit_ccu_data { + const char *reset_name; + struct clk_hw **hws; + size_t num; +}; + #define ccu_read(c, reg) \ ({ \ u32 tmp; \ @@ -45,4 +53,6 @@ static inline struct ccu_common *hw_to_ccu_common(struct = clk_hw *hw) #define ccu_update(c, reg, mask, val) \ regmap_update_bits((c)->regmap, (c)->reg_##reg, mask, val) =20 +int spacemit_ccu_probe(struct platform_device *pdev); + #endif /* _CCU_COMMON_H_ */ diff --git a/include/soc/spacemit/ccu.h b/include/soc/spacemit/ccu.h new file mode 100644 index 000000000000..84dcdecccc05 --- /dev/null +++ b/include/soc/spacemit/ccu.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __SOC_SPACEMIT_CCU_H__ +#define __SOC_SPACEMIT_CCU_H__ + +#include +#include + +/* 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); +} + +#endif /* __SOC_SPACEMIT_CCU_H__ */ diff --git a/include/soc/spacemit/k1-syscon.h b/include/soc/spacemit/k1-sys= con.h index 354751562c55..0be7a2e8d445 100644 --- a/include/soc/spacemit/k1-syscon.h +++ b/include/soc/spacemit/k1-syscon.h @@ -5,17 +5,7 @@ #ifndef __SOC_K1_SYSCON_H__ #define __SOC_K1_SYSCON_H__ =20 -/* 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); -} +#include "ccu.h" =20 /* APBS register offset */ #define APBS_PLL1_SWCR1 0x100 --=20 2.52.0