Skip to content

Commit 7990660

Browse files
committed
clk: rockchip: move px30 critical clocks to correct clock controller
The clocks in the px30 critical clock section are from the regular cru not the pmucru, so move them to the correct place. Signed-off-by: Heiko Stuebner <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent e407810 commit 7990660

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/clk/rockchip/clk-px30.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ static struct rockchip_clk_branch px30_clk_pmu_branches[] __initdata = {
976976
GATE(0, "pclk_cru_pmu", "pclk_pmu_pre", CLK_IGNORE_UNUSED, PX30_PMU_CLKGATE_CON(0), 8, GFLAGS),
977977
};
978978

979-
static const char *const px30_pmucru_critical_clocks[] __initconst = {
979+
static const char *const px30_cru_critical_clocks[] __initconst = {
980980
"aclk_bus_pre",
981981
"pclk_bus_pre",
982982
"hclk_bus_pre",
@@ -1021,6 +1021,9 @@ static void __init px30_clk_init(struct device_node *np)
10211021
&px30_cpuclk_data, px30_cpuclk_rates,
10221022
ARRAY_SIZE(px30_cpuclk_rates));
10231023

1024+
rockchip_clk_protect_critical(px30_cru_critical_clocks,
1025+
ARRAY_SIZE(px30_cru_critical_clocks));
1026+
10241027
rockchip_register_softrst(np, 12, reg_base + PX30_SOFTRST_CON(0),
10251028
ROCKCHIP_SOFTRST_HIWORD_MASK);
10261029

@@ -1053,9 +1056,6 @@ static void __init px30_pmu_clk_init(struct device_node *np)
10531056
rockchip_clk_register_branches(ctx, px30_clk_pmu_branches,
10541057
ARRAY_SIZE(px30_clk_pmu_branches));
10551058

1056-
rockchip_clk_protect_critical(px30_pmucru_critical_clocks,
1057-
ARRAY_SIZE(px30_pmucru_critical_clocks));
1058-
10591059
rockchip_clk_of_add_provider(np, ctx);
10601060
}
10611061
CLK_OF_DECLARE(px30_cru_pmu, "rockchip,px30-pmucru", px30_pmu_clk_init);

0 commit comments

Comments
 (0)