]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
clk: sunxi-ng: allow set parent clock (PLL_CPUX) for CPUX clock on H3
authorIcenowy Zheng <icenowy@aosc.io>
Sun, 23 Jul 2017 10:27:45 +0000 (18:27 +0800)
committerChen-Yu Tsai <wens@csie.org>
Fri, 4 Aug 2017 04:05:33 +0000 (12:05 +0800)
The CPUX clock, which is the main clock of the ARM core on Allwinner H3,
can be adjusted by changing the frequency of the PLL_CPUX clock.

Allowing setting parent clock for the CPUX clock, thus the PLL_CPUX
clock can be adjusted when adjusting the CPUX clock.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Fixes: 0577e4853bfb ("clk: sunxi-ng: Add H3 clocks")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
drivers/clk/sunxi-ng/ccu-sun8i-h3.c

index 406d0aac9fd64fec3676fb4c79386232cc9f3181..4cdbc88f2783da89f264c47c93b74057077d0ebb 100644 (file)
@@ -135,7 +135,7 @@ static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_de_clk, "pll-de",
 static const char * const cpux_parents[] = { "osc32k", "osc24M",
                                             "pll-cpux" , "pll-cpux" };
 static SUNXI_CCU_MUX(cpux_clk, "cpux", cpux_parents,
-                    0x050, 16, 2, CLK_IS_CRITICAL);
+                    0x050, 16, 2, CLK_IS_CRITICAL | CLK_SET_RATE_PARENT);
 
 static SUNXI_CCU_M(axi_clk, "axi", "cpux", 0x050, 0, 2, 0);