From nobody Mon Feb 9 09:22:03 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 A0D2C3F23B7; Thu, 8 Jan 2026 13:40:11 +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=1767879613; cv=none; b=h4MMtqwimwQjI3ma86di3hOXeAluGVa8PU7Qp2idlSxanf31k2bwkAPeOc2WddWLSsYSda7brui0uO4uKTe3pt4yoXYLeyLL0MGdrgQP3h6tum6vqHPvT+7IK53jMZ0NkybpXZd3ExDQCCvDUlJXH+pYdjz3v9q3MKNtR5l+xEI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767879613; c=relaxed/simple; bh=tv1qlFdPK5F6moCm/WsIv0oyoATpIX70yIzsxIpfdUI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tNS0PSkLOi0QHBgRKpW1N7JQyrR1p4X6G6Ga4pJOi/YoHE4UUO0huRVR6eA6FtIJROWtuFkYYC8sO7rLPmIXK8BwmjDU+Y7QGl+Kek9D8aWjJ3goJiL6O01FOJmwmtEvudB9C8rRxwKUXZMLfnoqruDC9VJ7bu+lEtpb8kCOCKY= 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 CC957341EC9; Thu, 08 Jan 2026 13:40:07 +0000 (UTC) From: Yixun Lan Date: Thu, 08 Jan 2026 21:39:22 +0800 Subject: [PATCH v4 1/4] clk: spacemit: prepare common ccu header 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: <20260108-06-k1-clk-common-v4-1-badf635993d3@gentoo.org> References: <20260108-06-k1-clk-common-v4-0-badf635993d3@gentoo.org> In-Reply-To: <20260108-06-k1-clk-common-v4-0-badf635993d3@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 X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1939; i=dlan@gentoo.org; h=from:subject:message-id; bh=tv1qlFdPK5F6moCm/WsIv0oyoATpIX70yIzsxIpfdUI=; b=owEB6QIW/ZANAwAKATGq6kdZTbvtAcsmYgBpX7Olu48TlQH6Ff2nvZMLeW+S96JcApoUmfooB SFNQY9tLH+JAq8EAAEKAJkWIQS1urjJwxtxFWcCI9wxqupHWU277QUCaV+zpRsUgAAAAAAEAA5t YW51MiwyLjUrMS4xMSwyLDJfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5 maWZ0aGhvcnNlbWFuLm5ldEI1QkFCOEM5QzMxQjcxMTU2NzAyMjNEQzMxQUFFQTQ3NTk0REJCRU QACgkQMarqR1lNu+3pdA//cBNMDQAZ53GPl/gyBl9Ce34Khu48jtPLr5mQjnK8t2rjVoWerP7oh Jg2GHSUk9sLWBwQi2Co2++YZpJ4ZMlUUhFbzfN496Jn0Gh9wid/ArjsSOZ4zTEe5aGtv52Nr7fr JZRvVAahQ9IMTDGPYCfahm52fKiLPck8nNO9FPCr5cMjM7uxZZ88CgwU+AO5M9CfKVSEya5zzJs eEwGIUDtUJW3HR4fXo5MNUkgHExT/JLJ4IN9UkCWmUKH8ecCfb/SsFE23A82Y1JJfqVjPa64GKj qrMMlmbeN1eulnXQtLSrPSO1shIdtbf4/drqEkg6xJo5LeI+8nh4ZXM/ScBx+uz2LbRyBdEF75J 2p9zfVDPOOWfyb6HRnPE9zS4wX92BxlUyq0FEA4KVMw+aPF5G5xEuVgCN6YGPVz4BjPSGVHKSVg FimbMrgXSOmPe4V7IbGpeLhMCrWk3bLpNP49nz462uHXI98N2G2Bk3husK8SeCHpT2RbGIW6Bnw WQn0qFaiTCalX+v+uVf27DxIe4Nq8PWjSth9sg/eEUfsg3WvOl56HYIhWHV6f4mZonvyztqBqRm dABd0HPIz43hUuZk/lqBU3TwYHbSXiZjMA+dFXvE+2dnq1KpPO2suw++FgG/Wv/eQuYQzmfEBs5 9V6j41rFqEw7kj7qZ0uoNjOy08NmhA= X-Developer-Key: i=dlan@gentoo.org; a=openpgp; fpr=50B03A1A5CBCD33576EF8CD7920C0DBCAABEFD55 In order to prepare adding clock driver for new K3 SoC, extract generic code to a separate common ccu header file, so they are not defined in K1 SoC-specific file, and then can be shared by all clock drivers. Reviewed-by: Alex Elder Signed-off-by: Yixun Lan --- include/soc/spacemit/ccu.h | 21 +++++++++++++++++++++ include/soc/spacemit/k1-syscon.h | 12 +----------- 2 files changed, 22 insertions(+), 11 deletions(-) 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 From nobody Mon Feb 9 09:22:03 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 E5B2E4DE929; Thu, 8 Jan 2026 13:40:15 +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=1767879617; cv=none; b=LP705zj7BKfML+6pNA7dGE83YkURb4LYanHTSMQDy2DSEoxZA/EPiuHiv9tnYbsPVgySIUlTaT1ynkfNJEFShhzJ0Mgq647l471CxJ0xy+R0bqEBe0NyaeSNmZb+i/m7pU3CULXZulfDxhj97bSggcubRkZ4IjUONb1IoRVDWbk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767879617; c=relaxed/simple; bh=wCwVBG8x1ps9/vbKC1hJJG16paIqZcbG0GgngPzz0EQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eRQUw3Mdd3XWvd8PBDHxUa8ckgWKsnDk1hoxgRf+E9rAEbVdoOFEqaQiRqkFy+/ZPd0POTXI/kyDhSzg2mQihU2lWnNGo7F0HQ4QjT7YHTQ+bvhvOSFKdny7XQU/cPFkEGVZRwRPLACsfPl5SQT6dBiUxT5Rk/WYSMSqQHLf67g= 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 80D01341ECC; Thu, 08 Jan 2026 13:40:11 +0000 (UTC) From: Yixun Lan Date: Thu, 08 Jan 2026 21:39:23 +0800 Subject: [PATCH v4 2/4] 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: <20260108-06-k1-clk-common-v4-2-badf635993d3@gentoo.org> References: <20260108-06-k1-clk-common-v4-0-badf635993d3@gentoo.org> In-Reply-To: <20260108-06-k1-clk-common-v4-0-badf635993d3@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=12491; i=dlan@gentoo.org; h=from:subject:message-id; bh=wCwVBG8x1ps9/vbKC1hJJG16paIqZcbG0GgngPzz0EQ=; b=owEB6QIW/ZANAwAKATGq6kdZTbvtAcsmYgBpX7Oo64ocdLv81GYkzF06vI5skrNtJIhXDyhJY xxV1zUKxOSJAq8EAAEKAJkWIQS1urjJwxtxFWcCI9wxqupHWU277QUCaV+zqBsUgAAAAAAEAA5t YW51MiwyLjUrMS4xMSwyLDJfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5 maWZ0aGhvcnNlbWFuLm5ldEI1QkFCOEM5QzMxQjcxMTU2NzAyMjNEQzMxQUFFQTQ3NTk0REJCRU QACgkQMarqR1lNu+3k1w//Tc6HDkuNEWfuqjlHl1NViG03JSLZpMNWLExgiav8SZB4m1WHRdY0j XVr6j7gCM/c8bXvpvJABExcdTAIEqIQPhPhVg/EKp6a6nDlVLAt7uPzOC4vHvOoXuSne7HpazQe sPTQ8j9eafYNpOAy9GDAeYU8wrtlY4BVTti9AJcTR0xULzZSaokx68hnXOrhDPvyojhTr4Xo6pb pOgqXB+u3Ewi790FfiPrVD0tRmanSKehGIX542mEB666ZOnQhES3+9iVWVB3J00hwE2X3GlEWVh UndcVgVpnd/JOfw2WKFnbwq0cftk7iV5kUOU9zEVh0uphC5mtn3ixs988tWxOqeTQyZWE8PGX1L o48y0ie/ClIQypDqpwNKqk4gqLdSgw0zdILjjkqJMpx7/EyqzZCbksQww+pxTWFHbMuY9nFl3re KAight92e8yMZsp58Qa1Ymut9l6khyYJXG4RTVWBSqWccx71s+1opsa/cMYEP5ZdwhDujelGnd2 AiIgaSqQ9SdSRklarz++1ee0dZwq+Pnu2WIOdGsuDl5oahOYeW5jZh38D1GqJdF3usW6WSYSk7K ARyHJfxVvG6h2Kqm0c62AV5mOA3jK+fR0OtykdTyHSA0zBAfeflKSXsq/4Smp4zQ6zgiWjTJycd 9jV00G/PJU4aYjkmcp4bzJ1507KcAQ= 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 from spacemit_ccu_k1 to spacemit_ccu where the auxiliary device registered, the auxiliary device id need to be adjusted. Idea of the patch comes from the review of K3 clock driver, please refer to this disucssion[1] for more detail. This change will introduce a runtime break to reset driver, and will be fixed in follow-up commit: ("reset: spacemit: fix auxiliary device id") Link: https://lore.kernel.org/all/aTo8sCPpVM1o9PKX@pie/ [1] Suggested-by: Yao Zi Reviewed-by: Alex Elder Signed-off-by: Yixun Lan --- drivers/clk/spacemit/ccu-k1.c | 179 ++--------------------------------= ---- drivers/clk/spacemit/ccu_common.c | 171 ++++++++++++++++++++++++++++++++++= ++ drivers/clk/spacemit/ccu_common.h | 10 +++ 3 files changed, 186 insertions(+), 174 deletions(-) diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c index 01d9485b615d..02c792a73759 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", @@ -1195,6 +1021,11 @@ static const struct of_device_id of_k1_ccu_match[] = =3D { }; MODULE_DEVICE_TABLE(of, of_k1_ccu_match); =20 +static int k1_ccu_probe(struct platform_device *pdev) +{ + return spacemit_ccu_probe(pdev, "spacemit,k1-pll"); +} + static struct platform_driver k1_ccu_driver =3D { .driver =3D { .name =3D "spacemit,k1-ccu", diff --git a/drivers/clk/spacemit/ccu_common.c b/drivers/clk/spacemit/ccu_c= ommon.c index 4412c4104dab..5f05b17f8452 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, const char *compat) +{ + 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 (compat && of_device_is_compatible(dev->of_node, compat)) { + 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..7ae244b5eace 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, const char *compat); + #endif /* _CCU_COMMON_H_ */ --=20 2.52.0 From nobody Mon Feb 9 09:22:03 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 04A4D4DF3D6; Thu, 8 Jan 2026 13:40:20 +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=1767879621; cv=none; b=OzZOssdsXenGSTjcyslSLZ+xm77/rE8uQYMBIKV15C28jGCq+gvHF5/EBWfWDIVZjxfsEjpfb5Y8MI7qp7uc3noJjpiZkAe5SVVQmQfgUJxqwXUonR9ToXuTZ2ou4Wc7ATgSUQn3sQtDVOxALbJS40qDi91UhEYxYOfV5zj01SA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767879621; c=relaxed/simple; bh=y46B++74XJZhaiqzj4f4dZZT9CJ1nDQjfA9Aref6lV0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pc13r8e/Mv1hupn1RVnsi/rk9MxjaY+DpwR6iBMmIsV3H1cmLnBeIaTzoV8SW/UBc0GMhljw1xUQqPCoLQvsIhhCXUUdlb0kOt3S9kq7XeZmkSMhg2CU9Ydr+uBbyYTQL2uvLEJW8jjM1hqV6TfInRNL54iN97arpZBaMmwnVTg= 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 0B0F0341EC9; Thu, 08 Jan 2026 13:40:15 +0000 (UTC) From: Yixun Lan Date: Thu, 08 Jan 2026 21:39:24 +0800 Subject: [PATCH v4 3/4] clk: spacemit: add platform SoC prefix to reset name 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: <20260108-06-k1-clk-common-v4-3-badf635993d3@gentoo.org> References: <20260108-06-k1-clk-common-v4-0-badf635993d3@gentoo.org> In-Reply-To: <20260108-06-k1-clk-common-v4-0-badf635993d3@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 X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2313; i=dlan@gentoo.org; h=from:subject:message-id; bh=y46B++74XJZhaiqzj4f4dZZT9CJ1nDQjfA9Aref6lV0=; b=owEB6QIW/ZANAwAKATGq6kdZTbvtAcsmYgBpX7Or4znHv7fFH5P5hyMKb2zjYhnFCIqLSMEvh faRGE9IBweJAq8EAAEKAJkWIQS1urjJwxtxFWcCI9wxqupHWU277QUCaV+zqxsUgAAAAAAEAA5t YW51MiwyLjUrMS4xMSwyLDJfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5 maWZ0aGhvcnNlbWFuLm5ldEI1QkFCOEM5QzMxQjcxMTU2NzAyMjNEQzMxQUFFQTQ3NTk0REJCRU QACgkQMarqR1lNu+1OPQ/8CHyUffWJfqCg1OOScglpE4LG83/kQZSon3DGctzZFwfcuq6i737W3 2/dmdFjwuhTQ4okGLYtRfy+fU7XgRCW+5sVQ6ZeuzdNv5gXSRUpYNtgcCQeIEjynn7k4n5LnSs6 lLQNMGhlKYANZvOskjYmo0PiKgaSLzVPIKuQOQloFOkVLwYwGavoGKhL4e949y83AGJCh4WNKd8 4U7OXPlX5ANDK3KjksTC5njjUzql602fpnd/E7RisU965iXwMbKMOBSCyrSTIe8Jj2nC16wpRu2 /GPHYVS/9rfzqBnwIcINMvuU9/9bgI6VN8wTMMXyLoGKFJH/hS0KakIXzpKiVT3bmvdKNe/bhSm JKS+uBQqG6Q4aZ013e9R+O495ZyQ3i+Sk+8qX15oCPU6eyTSdWBIBRRVub/GF7p+kQ9lRw8QCYl 69XzAQ1FUzveHbJqcef0U+YdN/w4t30H5Qm9uk/XIZsc/bpOsX2SVi25Ru097KUwgWHQMjTwgAU pB79ZnytvLRKHAq62qlube0QaxYTSjlWY9mt/azV7vgouw8dkpUs618tUxeq9nveSxLPK8CMMGb vCI/QQz6YoCDcgo13QhxWfoZQLrlS+harz73a9MUfcnzmjyRwxaXOEY1T4Pmv3P3dA72gV4wnwF 7VGg06nF9ptH/XwzFWVOrOV3YLvchE= X-Developer-Key: i=dlan@gentoo.org; a=openpgp; fpr=50B03A1A5CBCD33576EF8CD7920C0DBCAABEFD55 This change is needed for adding future new SpacemiT K3 reset driver. Since both K1 and K3 reset code register via the same module which its name changed to spacemit_ccu, it's necessary to encode the platform/SoC in the reset auxiliary device name to distinguish them, otherwise two reset drivers will claim to support same "compatible" auxiliary device even in the case of only one CCU clock driver got registered, which in the end lead to a broken reset driver. This change will introduce a runtime break to reset driver, and will be fixed in follow-up commit: ("reset: spacemit: fix auxiliary device id") Reviewed-by: Alex Elder Signed-off-by: Yixun Lan --- drivers/clk/spacemit/ccu-k1.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c index 02c792a73759..dee14d25f75d 100644 --- a/drivers/clk/spacemit/ccu-k1.c +++ b/drivers/clk/spacemit/ccu-k1.c @@ -789,7 +789,7 @@ static struct clk_hw *k1_ccu_mpmu_hws[] =3D { }; =20 static const struct spacemit_ccu_data k1_ccu_mpmu_data =3D { - .reset_name =3D "mpmu-reset", + .reset_name =3D "k1-mpmu-reset", .hws =3D k1_ccu_mpmu_hws, .num =3D ARRAY_SIZE(k1_ccu_mpmu_hws), }; @@ -900,7 +900,7 @@ static struct clk_hw *k1_ccu_apbc_hws[] =3D { }; =20 static const struct spacemit_ccu_data k1_ccu_apbc_data =3D { - .reset_name =3D "apbc-reset", + .reset_name =3D "k1-apbc-reset", .hws =3D k1_ccu_apbc_hws, .num =3D ARRAY_SIZE(k1_ccu_apbc_hws), }; @@ -971,21 +971,21 @@ static struct clk_hw *k1_ccu_apmu_hws[] =3D { }; =20 static const struct spacemit_ccu_data k1_ccu_apmu_data =3D { - .reset_name =3D "apmu-reset", + .reset_name =3D "k1-apmu-reset", .hws =3D k1_ccu_apmu_hws, .num =3D ARRAY_SIZE(k1_ccu_apmu_hws), }; =20 static const struct spacemit_ccu_data k1_ccu_rcpu_data =3D { - .reset_name =3D "rcpu-reset", + .reset_name =3D "k1-rcpu-reset", }; =20 static const struct spacemit_ccu_data k1_ccu_rcpu2_data =3D { - .reset_name =3D "rcpu2-reset", + .reset_name =3D "k1-rcpu2-reset", }; =20 static const struct spacemit_ccu_data k1_ccu_apbc2_data =3D { - .reset_name =3D "apbc2-reset", + .reset_name =3D "k1-apbc2-reset", }; =20 static const struct of_device_id of_k1_ccu_match[] =3D { --=20 2.52.0 From nobody Mon Feb 9 09:22:03 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 C29EF4DF3D6; Thu, 8 Jan 2026 13:40:24 +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=1767879626; cv=none; b=Gd2y5FaNu8lmmMkA+P6CH72eeSYyw3Gw8i+iPV8qsZyBbuBQUIBgrgFb34+aqBi+iSCU7WmoK60CLxAR/j7tBy1KMPnoRcDeHoXlVzawTTQo1P/qNlPjlBNf3PTfZqH+U0xxQXpf74KGQm37p5ZUqE61Wcxtq/BYwEi6xMFbbqw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767879626; c=relaxed/simple; bh=1H8Z3f7ZzM80z/iMzeQsDFj5WxSrKZyntFw1N0hz2E4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kI9y4Ftc5D7jnmLYbdQBc4/FdnIBl8MTZhjOQAHLlSs90V1N9zMuJQJbp9qzVshhcce9cBvaftxC8RlCGNoVQfNvEjB7VmpJJkQw+UPCNmiP+XsZck+HRJ7RvVDVf+uF76Oh1oC5zww4/iI1cPSh72nHyxVHjJtU2+MtXvPYPgA= 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 3494C341ECC; Thu, 08 Jan 2026 13:40:19 +0000 (UTC) From: Yixun Lan Date: Thu, 08 Jan 2026 21:39:25 +0800 Subject: [PATCH v4 4/4] reset: spacemit: fix auxiliary device id 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: <20260108-06-k1-clk-common-v4-4-badf635993d3@gentoo.org> References: <20260108-06-k1-clk-common-v4-0-badf635993d3@gentoo.org> In-Reply-To: <20260108-06-k1-clk-common-v4-0-badf635993d3@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 X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1394; i=dlan@gentoo.org; h=from:subject:message-id; bh=1H8Z3f7ZzM80z/iMzeQsDFj5WxSrKZyntFw1N0hz2E4=; b=owEB6QIW/ZANAwAKATGq6kdZTbvtAcsmYgBpX7Ou6VH6nun8PKQLWXt5Ac58rGXOK5r0iKto4 WcVU0dBwyGJAq8EAAEKAJkWIQS1urjJwxtxFWcCI9wxqupHWU277QUCaV+zrhsUgAAAAAAEAA5t YW51MiwyLjUrMS4xMSwyLDJfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5 maWZ0aGhvcnNlbWFuLm5ldEI1QkFCOEM5QzMxQjcxMTU2NzAyMjNEQzMxQUFFQTQ3NTk0REJCRU QACgkQMarqR1lNu+0LeQ//f826Vjtrq9fIHoahuT856hkDj2NVqRN3NHXTcOkZyS3uUUudjEUiY ZKZeoP2HBQUbLY1NeEXiwrtwIww3azIT6Xqtlk6ZN6KSRpTYWxwydqWPBtRj/LRadXZaJwSJOcS enxpiZHkzJZBzjmrQ+LDQoOa2Lc21PGtjmxqd9Im/4486ZFB/Ma0TUQjhDDiF9WHt1U3gCR0JQZ 5QBgChycoK1o+G4UJSpUTWt2b9HeR+ymAbj2sv1H0xPpK2v/Shek+2N3+HxDyzoIK2g9Q73FMYI m61NuNlscttcozUH6+LKTp2GCGMCscJpLiaV7c3ke9cSuKjA2EhyC5yg+urigai6m6U1qR/hOuC Bnq7yGwXbJ9WE/DXF8wmWCvMO3KEmGYCiGI998ElinPAlD6tnhmGrkBF8bJPC9CKbPmpQ2o/Yz9 /m+dLpOHMtC1qhiR30rnR7Bz5Ivg3aRqJuOx8CSjMRYRKjCzfb1vmE5x4D1KKHIs5z5o6UYKz/1 481AHojGbvUMwHiYTo7TScIxcc4iIP6if6hY8Q0aZ6iCH3VaD0WhkMHwuSOYMGD3EpcF674yx1K ttLBE5Y4mm0e5tYSndNYI873Id47FX9J21hzpBMI0TVycek1+ZrJA+ZSfi0rqR1pQVH6y2QSXTQ ZQKhssjoMpCS27Pg1vw8YGO8NJZ/5I= X-Developer-Key: i=dlan@gentoo.org; a=openpgp; fpr=50B03A1A5CBCD33576EF8CD7920C0DBCAABEFD55 Due to the auxiliary register procedure moved to ccu common module where the module name changed to spacemit_ccu, then the reset auxiliary device register id also need to be adjusted in order to prepare for adding new K3 reset driver, otherwise two reset drivers will claim to support same "compatible" auxiliary device. In order to prevent the reset driver breakage, this commit is necessary as a post-fix for changes introduced by two patches below, and should be merged with them to make the patch series runtime bisectable. ("clk: spacemit: add platform SoC prefix to reset name") ("clk: spacemit: extract common ccu functions") Acked-by: Philipp Zabel Reviewed-by: Alex Elder Signed-off-by: Yixun Lan --- drivers/reset/reset-spacemit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/reset/reset-spacemit.c b/drivers/reset/reset-spacemit.c index e1272aff28f7..cc7fd1f8750d 100644 --- a/drivers/reset/reset-spacemit.c +++ b/drivers/reset/reset-spacemit.c @@ -278,7 +278,7 @@ static int spacemit_reset_probe(struct auxiliary_device= *adev, =20 #define K1_AUX_DEV_ID(_unit) \ { \ - .name =3D "spacemit_ccu_k1." #_unit "-reset", \ + .name =3D "spacemit_ccu.k1-" #_unit "-reset", \ .driver_data =3D (kernel_ulong_t)&k1_ ## _unit ## _reset_data, \ } =20 --=20 2.52.0