Skip to content

Commit 8a2b53c

Browse files
yueshuwzyy2
authored andcommitted
MINIARM: set npll be used for hdmi only
Change-Id: I8bebfb2cfb68e3dad172e5547d3886526ad5e912 Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
1 parent 88dcbe1 commit 8a2b53c

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

arch/arm/boot/dts/rk3288.dtsi

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@
990990
<&cru PCLK_PERI>;
991991
assigned-clock-rates = <594000000>,
992992
<500000000>, <300000000>,
993-
<150000000>, <75000000>,
993+
<0>, <75000000>,
994994
<300000000>, <150000000>,
995995
<75000000>;
996996
};
@@ -1212,6 +1212,8 @@
12121212
resets = <&cru SRST_LCDC0_AXI>, <&cru SRST_LCDC0_AHB>, <&cru SRST_LCDC0_DCLK>;
12131213
reset-names = "axi", "ahb", "dclk";
12141214
iommus = <&vopb_mmu>;
1215+
assigned-clocks = <&cru DCLK_VOP0>;
1216+
assigned-clock-parents = <&cru PLL_NPLL>;
12151217
status = "disabled";
12161218

12171219
vopb_out: port {

drivers/clk/rockchip/clk-rk3288.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,9 @@ static struct rockchip_pll_clock rk3288_pll_clks[] __initdata = {
211211
[cpll] = PLL(pll_rk3066, PLL_CPLL, "cpll", mux_pll_p, 0, RK3288_PLL_CON(8),
212212
RK3288_MODE_CON, 8, 7, 0, rk3288_pll_rates),
213213
[gpll] = PLL(pll_rk3066, PLL_GPLL, "gpll", mux_pll_p, 0, RK3288_PLL_CON(12),
214-
RK3288_MODE_CON, 12, 8, ROCKCHIP_PLL_SYNC_RATE, rk3288_pll_rates),
214+
RK3288_MODE_CON, 12, 8, 0, rk3288_pll_rates),
215215
[npll] = PLL(pll_rk3066, PLL_NPLL, "npll", mux_pll_p, 0, RK3288_PLL_CON(16),
216-
RK3288_MODE_CON, 14, 9, ROCKCHIP_PLL_SYNC_RATE, rk3288_pll_rates),
216+
RK3288_MODE_CON, 14, 9, 0, rk3288_pll_rates),
217217
};
218218

219219
static struct clk_div_table div_hclk_cpu_t[] = {
@@ -428,7 +428,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
428428
RK3288_CLKSEL_CON(30), 14, 2, MFLAGS, 8, 5, DFLAGS,
429429
RK3288_CLKGATE_CON(3), 4, GFLAGS),
430430

431-
COMPOSITE(DCLK_VOP0, "dclk_vop0", mux_pll_src_cpll_gpll_npll_p, 0,
431+
COMPOSITE(DCLK_VOP0, "dclk_vop0", mux_pll_src_cpll_gpll_npll_p, CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT,
432432
RK3288_CLKSEL_CON(27), 0, 2, MFLAGS, 8, 8, DFLAGS,
433433
RK3288_CLKGATE_CON(3), 1, GFLAGS),
434434
COMPOSITE(DCLK_VOP1, "dclk_vop1", mux_pll_src_cpll_gpll_npll_p, 0,

0 commit comments

Comments
 (0)