Skip to content

Commit ecff77f

Browse files
committed
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 <p.zabel@pengutronix.de> Reviewed-by: Alex Elder <elder@riscstar.com> Signed-off-by: Yixun Lan <dlan@gentoo.org>
1 parent 8f0b4cc commit ecff77f

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/reset/reset-spacemit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ static int spacemit_reset_probe(struct auxiliary_device *adev,
278278

279279
#define K1_AUX_DEV_ID(_unit) \
280280
{ \
281-
.name = "spacemit_ccu_k1." #_unit "-reset", \
281+
.name = "spacemit_ccu.k1-" #_unit "-reset", \
282282
.driver_data = (kernel_ulong_t)&k1_ ## _unit ## _reset_data, \
283283
}
284284

0 commit comments

Comments
 (0)