From: Heiko Stuebner Date: Wed, 20 Jan 2016 20:47:57 +0000 (+0100) Subject: UPSTREAM: clk: rockchip: rk3368: fix hdmi_cec gate-register X-Git-Tag: firefly_0821_release~3455 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=24ebcaf1c0a06ebf3e4ce79b9ef8b3310b0328c2;p=firefly-linux-kernel-4.4.55.git UPSTREAM: clk: rockchip: rk3368: fix hdmi_cec gate-register Fix a typo making the sclk_hdmi_cec access a wrong register to handle its gate. Fixes: 3536c97a52db ("clk: rockchip: add rk3368 clock controller") Signed-off-by: Heiko Stuebner Reviewed-by: zhangqing Cc: stable@vger.kernel.org (cherry picked from git.kernel.org mmind/linux-rockchip.git v4.6-clk/next commit fd0c0740fac17a014704ef89d8c8b1768711ca59) Change-Id: I549ef7e3c29df9fe7d4280288639e401727a001e --- diff --git a/drivers/clk/rockchip/clk-rk3368.c b/drivers/clk/rockchip/clk-rk3368.c index b765f95addd5..eec7f3e2083d 100644 --- a/drivers/clk/rockchip/clk-rk3368.c +++ b/drivers/clk/rockchip/clk-rk3368.c @@ -442,7 +442,7 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { GATE(SCLK_HDMI_HDCP, "sclk_hdmi_hdcp", "xin24m", 0, RK3368_CLKGATE_CON(4), 13, GFLAGS), GATE(SCLK_HDMI_CEC, "sclk_hdmi_cec", "xin32k", 0, - RK3368_CLKGATE_CON(5), 12, GFLAGS), + RK3368_CLKGATE_CON(4), 12, GFLAGS), COMPOSITE_NODIV(0, "vip_src", mux_pll_src_cpll_gpll_p, 0, RK3368_CLKSEL_CON(21), 15, 1, MFLAGS,