projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM64: DTS: Add rk3399-firefly uart4 device, node as /dev/ttyS1
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
clk
/
rockchip
/
clk-rk3036.c
diff --git
a/drivers/clk/rockchip/clk-rk3036.c
b/drivers/clk/rockchip/clk-rk3036.c
index 3aa789dfcea18238b5e3ec873688b85fdcc83d92..eab84da474964f56a28218eb88436a6ffe74f1b0 100644
(file)
--- a/
drivers/clk/rockchip/clk-rk3036.c
+++ b/
drivers/clk/rockchip/clk-rk3036.c
@@
-263,7
+263,7
@@
static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = {
RK2928_CLKGATE_CON(1), 13, GFLAGS,
&rk3036_uart2_fracmux),
RK2928_CLKGATE_CON(1), 13, GFLAGS,
&rk3036_uart2_fracmux),
- COMPOSITE(
0
, "aclk_vcodec", mux_pll_src_3plls_p, 0,
+ COMPOSITE(
ACLK_VCODEC
, "aclk_vcodec", mux_pll_src_3plls_p, 0,
RK2928_CLKSEL_CON(32), 14, 2, MFLAGS, 8, 5, DFLAGS,
RK2928_CLKGATE_CON(3), 11, GFLAGS),
RK2928_CLKSEL_CON(32), 14, 2, MFLAGS, 8, 5, DFLAGS,
RK2928_CLKGATE_CON(3), 11, GFLAGS),