From bdba697e30d1fae3fdba20c41c2da0ea48fc281c Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Mon, 2 May 2016 18:36:22 +0200 Subject: [PATCH] FROMLIST: clk: rockchip: make rk3399 vop dclks keep their rate on parent rate changes The rk3399 hdmi phy is supplied by the vpll directly and needs to adapt that frequency depending on the selected resolution on the hdmi output. For the hdmi-phy the vpll frequency is supplied unchanged without any dividers being present there. The vpll also is one of the sources the general display clock of the visual output processor (vop) and as it is somewhat special for display operations possibly also the preferred pll source. Here a divider is available between the pll-mux and the vop clock, so that this part can adapt the resulting frequency if needed. So to keep the vop clock in line with the target rate, set the newly introduced CLK_KEEP_REQ_RATE flag for the dclk_vop clocks on rk3399. (am from https://patchwork.kernel.org/patch/8993771/) Change-Id: Iba9a179b764472f22d7531eb0c662dcd982433d4 Signed-off-by: Heiko Stuebner Signed-off-by: Xing Zheng --- drivers/clk/rockchip/clk-rk3399.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c index 6c9e332aaaa7..26857790210e 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c @@ -282,11 +282,11 @@ static struct rockchip_clk_branch rk3399_uart4_pmu_fracmux __initdata = RK3399_PMU_CLKSEL_CON(5), 8, 2, MFLAGS); static struct rockchip_clk_branch rk3399_dclk_vop0_fracmux __initdata = - MUX(DCLK_VOP0, "dclk_vop0", mux_dclk_vop0_p, CLK_SET_RATE_PARENT, + MUX(DCLK_VOP0, "dclk_vop0", mux_dclk_vop0_p, CLK_SET_RATE_PARENT | CLK_KEEP_REQ_RATE, RK3399_CLKSEL_CON(49), 11, 1, MFLAGS); static struct rockchip_clk_branch rk3399_dclk_vop1_fracmux __initdata = - MUX(DCLK_VOP1, "dclk_vop1", mux_dclk_vop1_p, CLK_SET_RATE_PARENT, + MUX(DCLK_VOP1, "dclk_vop1", mux_dclk_vop1_p, CLK_SET_RATE_PARENT | CLK_KEEP_REQ_RATE, RK3399_CLKSEL_CON(50), 11, 1, MFLAGS); static struct rockchip_clk_branch rk3399_pmuclk_wifi_fracmux __initdata = -- 2.34.1