Merge tags 'spacemit-clkrst-v6.20-1' and 'spacemit-clkrst-v6.20-2' into spacemit-clkrst-v6.20

dlan17 · dlan17 · commit b2a61006c994 · 2026-01-09T09:47:30.000+08:00
diff --git 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, \
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ static int spacemit_reset_probe(struct auxiliary_device *adev,`
`278`	`278`
`279`	`279`	`#define K1_AUX_DEV_ID(_unit) \`
`280`	`280`	`{ \`
`281`		`- .name = "spacemit_ccu_k1." #_unit "-reset", \`
	`281`	`+ .name = "spacemit_ccu.k1-" #_unit "-reset", \`
`282`	`282`	`.driver_data = (kernel_ulong_t)&k1_ ## _unit ## _reset_data, \`
`283`	`283`	`}`
`284`	`284`