Skip to content

Commit 73403cf

Browse files
finley1226rkhuangtao
authored andcommitted
clk: rockchip: px30: fix gpll enable_cnt and prepare_cnt error
The gpll clock has not yet been created when its children do enable and prepare in cru critical talbe, so move its children into pmucru critical talbe that the gpll clock has been created before its children do enable and prepare. Change-Id: If5243326bf1d3c926bb1bb12e56e4b9fc9282762 Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
1 parent fda77d7 commit 73403cf

1 file changed

Lines changed: 1 addition & 6 deletions

File tree

drivers/clk/rockchip/clk-px30.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,17 +1004,14 @@ static struct rockchip_clk_branch px30_clk_pmu_branches[] __initdata = {
10041004
GATE(0, "pclk_cru_pmu", "pclk_pmu_pre", CLK_IGNORE_UNUSED, PX30_PMU_CLKGATE_CON(0), 8, GFLAGS),
10051005
};
10061006

1007-
static const char *const px30_critical_clocks[] __initconst = {
1007+
static const char *const px30_pmucru_critical_clocks[] __initconst = {
10081008
"aclk_bus_pre",
10091009
"pclk_bus_pre",
10101010
"hclk_bus_pre",
10111011
"aclk_peri_pre",
10121012
"hclk_peri_pre",
10131013
"aclk_gpu_niu",
10141014
"pclk_top_pre",
1015-
};
1016-
1017-
static const char *const px30_pmucru_critical_clocks[] __initconst = {
10181015
"pclk_pmu_pre",
10191016
};
10201017

@@ -1083,8 +1080,6 @@ static void __init px30_clk_init(struct device_node *np)
10831080
PX30_GRF_SOC_STATUS0);
10841081
rockchip_clk_register_branches(ctx, px30_clk_branches,
10851082
ARRAY_SIZE(px30_clk_branches));
1086-
rockchip_clk_protect_critical(px30_critical_clocks,
1087-
ARRAY_SIZE(px30_critical_clocks));
10881083

10891084
rockchip_clk_register_armclk(ctx, ARMCLK, "armclk",
10901085
mux_armclk_p, ARRAY_SIZE(mux_armclk_p),

0 commit comments

Comments
 (0)