]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
reset: spacemit: fix auxiliary device id
authorYixun Lan <dlan@gentoo.org>
Thu, 18 Dec 2025 21:34:39 +0000 (05:34 +0800)
committerYixun Lan <dlan@gentoo.org>
Fri, 9 Jan 2026 00:53:33 +0000 (08:53 +0800)
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 <p.zabel@pengutronix.de>
Reviewed-by: Alex Elder <elder@riscstar.com>
Signed-off-by: Yixun Lan <dlan@gentoo.org>
drivers/reset/reset-spacemit.c

index e1272aff28f74fcc7112cfff19d234305a81c6f2..cc7fd1f8750d422f3d8f96367ae259f38418c44b 100644 (file)
@@ -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, \
        }