Skip to content

Commit 0664a46

Browse files
committed
clk: spacemit: add platform SoC prefix to reset name
This change is needed for adding future new SpacemiT K3 reset driver. Since both K1 and K3 reset code register via the same module which its name changed to spacemit_ccu, it's necessary to encode the platform/SoC in the reset auxiliary device name to distinguish them, otherwise two reset drivers will claim to support same "compatible" auxiliary device even in the case of only one CCU clock driver got registered, which in the end lead to a broken reset driver. This change will introduce a runtime break to reset driver, and will be fixed in follow-up commit: ecff77f ("reset: spacemit: fix auxiliary device id") Link: https://lore.kernel.org/r/20260108-06-k1-clk-common-v4-3-badf635993d3@gentoo.org Reviewed-by: Alex Elder <elder@riscstar.com> Signed-off-by: Yixun Lan <dlan@gentoo.org>
1 parent 9966946 commit 0664a46

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/clk/spacemit/ccu-k1.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ static struct clk_hw *k1_ccu_mpmu_hws[] = {
789789
};
790790

791791
static const struct spacemit_ccu_data k1_ccu_mpmu_data = {
792-
.reset_name = "mpmu-reset",
792+
.reset_name = "k1-mpmu-reset",
793793
.hws = k1_ccu_mpmu_hws,
794794
.num = ARRAY_SIZE(k1_ccu_mpmu_hws),
795795
};
@@ -900,7 +900,7 @@ static struct clk_hw *k1_ccu_apbc_hws[] = {
900900
};
901901

902902
static const struct spacemit_ccu_data k1_ccu_apbc_data = {
903-
.reset_name = "apbc-reset",
903+
.reset_name = "k1-apbc-reset",
904904
.hws = k1_ccu_apbc_hws,
905905
.num = ARRAY_SIZE(k1_ccu_apbc_hws),
906906
};
@@ -971,21 +971,21 @@ static struct clk_hw *k1_ccu_apmu_hws[] = {
971971
};
972972

973973
static const struct spacemit_ccu_data k1_ccu_apmu_data = {
974-
.reset_name = "apmu-reset",
974+
.reset_name = "k1-apmu-reset",
975975
.hws = k1_ccu_apmu_hws,
976976
.num = ARRAY_SIZE(k1_ccu_apmu_hws),
977977
};
978978

979979
static const struct spacemit_ccu_data k1_ccu_rcpu_data = {
980-
.reset_name = "rcpu-reset",
980+
.reset_name = "k1-rcpu-reset",
981981
};
982982

983983
static const struct spacemit_ccu_data k1_ccu_rcpu2_data = {
984-
.reset_name = "rcpu2-reset",
984+
.reset_name = "k1-rcpu2-reset",
985985
};
986986

987987
static const struct spacemit_ccu_data k1_ccu_apbc2_data = {
988-
.reset_name = "apbc2-reset",
988+
.reset_name = "k1-apbc2-reset",
989989
};
990990

991991
static const struct of_device_id of_k1_ccu_match[] = {

0 commit comments

Comments
 (0)