Skip to content

Commit 5d661ca

Browse files
ck_zhangasus-leslieyu
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 5c7beaa commit 5d661ca

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

arch/arm/boot/dts/rk3288.dtsi

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@
10741074
<&cru ACLK_VIO0>, <&cru ACLK_VIO1>,
10751075
<&cru ACLK_GPU>;
10761076
assigned-clock-rates =
1077-
<594000000>, <1250000000>,
1077+
<594000000>, <0>,
10781078
<300000000>, <150000000>,
10791079
<75000000>, <300000000>,
10801080
<150000000>, <75000000>,
@@ -1432,6 +1432,8 @@
14321432
resets = <&cru SRST_LCDC0_AXI>, <&cru SRST_LCDC0_AHB>, <&cru SRST_LCDC0_DCLK>;
14331433
reset-names = "axi", "ahb", "dclk";
14341434
iommus = <&vopb_mmu>;
1435+
assigned-clocks = <&cru DCLK_VOP0>;
1436+
assigned-clock-parents = <&cru PLL_NPLL>;
14351437
status = "disabled";
14361438

14371439
vopb_out: port {

drivers/clk/rockchip/clk-rk3288.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
484484
RK3288_CLKSEL_CON(30), 14, 2, MFLAGS, 8, 5, DFLAGS,
485485
RK3288_CLKGATE_CON(3), 4, GFLAGS),
486486

487-
COMPOSITE(DCLK_VOP0, "dclk_vop0", mux_pll_src_cpll_gpll_npll_p, 0,
487+
COMPOSITE(DCLK_VOP0, "dclk_vop0", mux_pll_src_cpll_gpll_npll_p, CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT,
488488
RK3288_CLKSEL_CON(27), 0, 2, MFLAGS, 8, 8, DFLAGS,
489489
RK3288_CLKGATE_CON(3), 1, GFLAGS),
490490
COMPOSITE(DCLK_VOP1, "dclk_vop1", mux_pll_src_cpll_gpll_npll_p, 0,

0 commit comments

Comments
 (0)