Skip to content

Commit 632b78c

Browse files
ck_zhangCK Zhang
authored andcommitted
hdmi: change vop0 clk source to npll
To support more hdmi resolution we need a clk source which can modulate to any target clk whick can meet hdmi resolution that user set. Change-Id: I47a2da3629bcd018dfc6c70d5f21707cca0c5e8f
1 parent 0839a79 commit 632b78c

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

arch/arm/boot/dts/rk3288.dtsi

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@
936936
<&cru PCLK_PERI>;
937937
assigned-clock-rates = <0>, <0>,
938938
<594000000>, <400000000>,
939-
<500000000>, <300000000>,
939+
<0>, <300000000>,
940940
<150000000>, <75000000>,
941941
<300000000>, <150000000>,
942942
<75000000>;
@@ -997,6 +997,8 @@
997997
resets = <&cru SRST_LCDC0_AXI>, <&cru SRST_LCDC0_AHB>, <&cru SRST_LCDC0_DCLK>;
998998
reset-names = "axi", "ahb", "dclk";
999999
iommus = <&vopb_mmu>;
1000+
assigned-clocks = <&cru DCLK_VOP0>;
1001+
assigned-clock-parents = <&cru PLL_NPLL>;
10001002
status = "disabled";
10011003

10021004
vopb_out: port {

drivers/clk/rockchip/clk-rk3288.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,11 @@ static struct rockchip_pll_clock rk3288_pll_clks[] __initdata = {
210210
[dpll] = PLL(pll_rk3066, PLL_DPLL, "dpll", mux_pll_p, 0, RK3288_PLL_CON(4),
211211
RK3288_MODE_CON, 4, 5, 0, NULL),
212212
[cpll] = PLL(pll_rk3066, PLL_CPLL, "cpll", mux_pll_p, 0, RK3288_PLL_CON(8),
213-
RK3288_MODE_CON, 8, 7, ROCKCHIP_PLL_SYNC_RATE, rk3288_pll_rates),
213+
RK3288_MODE_CON, 8, 7, 0, rk3288_pll_rates),
214214
[gpll] = PLL(pll_rk3066, PLL_GPLL, "gpll", mux_pll_p, 0, RK3288_PLL_CON(12),
215-
RK3288_MODE_CON, 12, 8, ROCKCHIP_PLL_SYNC_RATE, rk3288_pll_rates),
215+
RK3288_MODE_CON, 12, 8, 0, rk3288_pll_rates),
216216
[npll] = PLL(pll_rk3066, PLL_NPLL, "npll", mux_pll_p, 0, RK3288_PLL_CON(16),
217-
RK3288_MODE_CON, 14, 9, ROCKCHIP_PLL_SYNC_RATE, rk3288_pll_rates),
217+
RK3288_MODE_CON, 14, 9, 0, rk3288_pll_rates),
218218
};
219219

220220
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)