From: Heiko Stuebner Date: Wed, 27 Jan 2016 20:38:37 +0000 (+0100) Subject: UPSTREAM: clk: rockchip: fix parent of hclk_vcodec on rk3036 X-Git-Tag: firefly_0821_release~2575 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f6e7f1e32a9511979c06fe49e4f1571838a4082e;p=firefly-linux-kernel-4.4.55.git UPSTREAM: clk: rockchip: fix parent of hclk_vcodec on rk3036 hclk_vcodec is a child of aclk_vcodec with the fixed factor clock hclk_vcodec_pre in between and not a child of hclk_disp_pre. Change-Id: I0298d0a1adef3cc0f9aa6e759947c8f90c4c252f Signed-off-by: Heiko Stuebner Signed-off-by: Caesar Wang (cherry picked from git.kernel.org next/linux-next.git master commit aebe3ad801ebbcd90b3649c24ae0e90d2db8bde8) --- diff --git a/drivers/clk/rockchip/clk-rk3036.c b/drivers/clk/rockchip/clk-rk3036.c index eb0ce6bdbd28..db6bd84589ac 100644 --- a/drivers/clk/rockchip/clk-rk3036.c +++ b/drivers/clk/rockchip/clk-rk3036.c @@ -383,7 +383,7 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = { GATE(HCLK_LCDC, "hclk_lcdc", "hclk_disp_pre", 0, RK2928_CLKGATE_CON(9), 5, GFLAGS), /* hclk_video gates */ - GATE(HCLK_VCODEC, "hclk_vcodec", "hclk_disp_pre", 0, RK2928_CLKGATE_CON(3), 12, GFLAGS), + GATE(HCLK_VCODEC, "hclk_vcodec", "hclk_vcodec_pre", 0, RK2928_CLKGATE_CON(3), 12, GFLAGS), /* xin24m gates */ GATE(SCLK_PVTM_CORE, "sclk_pvtm_core", "xin24m", 0, RK2928_CLKGATE_CON(10), 0, GFLAGS),