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:
a5e2552
)
clk: rockchip: rk3399: pclkin_isp1_wrapper should source from pclkin_cif
author
Xing Zheng
<zhengxing@rock-chips.com>
Mon, 28 Mar 2016 03:34:33 +0000
(11:34 +0800)
committer
Gerrit Code Review
<gerrit@rock-chips.com>
Mon, 28 Mar 2016 09:05:50 +0000
(17:05 +0800)
Change-Id: Id2ccc4003fcd286594fa2c2fc366f7c922417883
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
drivers/clk/rockchip/clk-rk3399.c
patch
|
blob
|
history
diff --git
a/drivers/clk/rockchip/clk-rk3399.c
b/drivers/clk/rockchip/clk-rk3399.c
index 639eaf608dbd3e1fd1b2dfa72423669602fea6bb..f361e4dfa4caeadcce43c88a9bf440ad6cf07441 100644
(file)
--- a/
drivers/clk/rockchip/clk-rk3399.c
+++ b/
drivers/clk/rockchip/clk-rk3399.c
@@
-1202,10
+1202,10
@@
static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
* so we ignore the mux and make clocks nodes as following,
*
* pclkin_cifinv --|-------\
- * |GSC20_9|-- pclkin_cifmux
+ * |GSC20_9|-- pclkin_cifmux
-- |G27_6| -- pclkin_isp1_wrapper
* pclkin_cif --|-------/
*/
- GATE(PCLK_ISP1_WRAPPER, "pclkin_isp1_wrapper", "pclkin_cif
mux
", CLK_IGNORE_UNUSED,
+ GATE(PCLK_ISP1_WRAPPER, "pclkin_isp1_wrapper", "pclkin_cif", CLK_IGNORE_UNUSED,
RK3399_CLKGATE_CON(27), 6, GFLAGS),
/* cif */