projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c6d5fe2
)
clk: rockchip: rk3368: fix parents of video encoder/decoder
author
Heiko Stuebner
<heiko@sntech.de>
Wed, 20 Jan 2016 18:22:38 +0000
(19:22 +0100)
committer
Heiko Stuebner
<heiko@sntech.de>
Sun, 24 Jan 2016 22:29:16 +0000
(23:29 +0100)
The vdpu and vepu clocks can also be parented to the npll and current
parent list also is wrong as it would use the npll as "usbphy" source,
so adapt the parent to the correct one.
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
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 82a0c3e528ce7ec8814c0a78be1a04272c1f3d02..990e1dc7529d8d8ac2716a8f555f16cbb89eb731 100644
(file)
--- a/
drivers/clk/rockchip/clk-rk3368.c
+++ b/
drivers/clk/rockchip/clk-rk3368.c
@@
-384,10
+384,10
@@
static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = {
* Clock-Architecture Diagram 3
*/
- COMPOSITE(0, "aclk_vepu", mux_pll_src_cpll_gpll_usb_p, 0,
+ COMPOSITE(0, "aclk_vepu", mux_pll_src_cpll_gpll_
npll_
usb_p, 0,
RK3368_CLKSEL_CON(15), 6, 2, MFLAGS, 0, 5, DFLAGS,
RK3368_CLKGATE_CON(4), 6, GFLAGS),
- COMPOSITE(0, "aclk_vdpu", mux_pll_src_cpll_gpll_usb_p, 0,
+ COMPOSITE(0, "aclk_vdpu", mux_pll_src_cpll_gpll_
npll_
usb_p, 0,
RK3368_CLKSEL_CON(15), 14, 2, MFLAGS, 8, 5, DFLAGS,
RK3368_CLKGATE_CON(4), 7, GFLAGS),