From: Yixun Lan Date: Thu, 18 Dec 2025 21:34:39 +0000 (+0800) Subject: reset: spacemit: fix auxiliary device id X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecff77f7c04141cc18ee2482936c96117060c0f2;p=thirdparty%2Fkernel%2Flinux.git reset: spacemit: fix auxiliary device id 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") Link: https://lore.kernel.org/r/20260108-06-k1-clk-common-v4-4-badf635993d3@gentoo.org Acked-by: Philipp Zabel Reviewed-by: Alex Elder Signed-off-by: Yixun Lan --- diff --git a/drivers/reset/reset-spacemit.c b/drivers/reset/reset-spacemit.c index e1272aff28f74..cc7fd1f8750d4 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, #define K1_AUX_DEV_ID(_unit) \ { \ - .name = "spacemit_ccu_k1." #_unit "-reset", \ + .name = "spacemit_ccu.k1-" #_unit "-reset", \ .driver_data = (kernel_ulong_t)&k1_ ## _unit ## _reset_data, \ }