Unverified Commit ecff77f7 authored by Yixun Lan's avatar Yixun Lan
Browse files

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: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: default avatarAlex Elder <elder@riscstar.com>
Signed-off-by: default avatarYixun Lan <dlan@gentoo.org>
parent 8f0b4cce

drivers/reset/reset-spacemit.c

+1 −1
Original line number Diff line number Diff line
@@ -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, \

	}