projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cb43802
)
UPSTREAM: clk: rockchip: rk3368: fix hdmi_cec gate-register
author
Heiko Stuebner
<heiko@sntech.de>
Wed, 20 Jan 2016 20:47:57 +0000
(21:47 +0100)
committer
Gerrit Code Review
<gerrit@rock-chips.com>
Tue, 26 Jan 2016 07:54:06 +0000
(15:54 +0800)
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 <heiko@sntech.de>
Reviewed-by: zhangqing <zhangqing@rock-chips.com>
Cc: stable@vger.kernel.org
(cherry picked from git.kernel.org mmind/linux-rockchip.git v4.6-clk/next
commit
fd0c0740fac17a014704ef89d8c8b1768711ca59
)
Change-Id: I549ef7e3c29df9fe7d4280288639e401727a001e
drivers/clk/rockchip/clk-rk3368.c
patch
|
blob
|
history
diff --git
a/drivers/clk/rockchip/clk-rk3368.c
b/drivers/clk/rockchip/clk-rk3368.c
index b765f95addd5afc8d707289c85531fc1bcf42443..eec7f3e2083dde7e92d4a2c1720573c1ea5e94fb 100644
(file)
--- 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,