OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6fa44d4
)
clk: rockchip: add "," to mux_pll_src_apll_dpll_gpll_usb480m_p on rk3036
author
Heiko Stuebner
<heiko@sntech.de>
Wed, 1 Mar 2017 21:00:41 +0000
(22:00 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sun, 14 May 2017 12:00:19 +0000
(14:00 +0200)
commit
9b1b23f03abdd25ffde8bbfe5824b89bc0448c28
upstream.
The mux_pll_src_apll_dpll_gpll_usb480m_p parent list was missing a ","
between the 3rd and 4th parent names, making them fall together and thus
lookups fail. Fix that.
Fixes:
5190c08b2989
("clk: rockchip: add clock controller for rk3036")
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/clk/rockchip/clk-rk3036.c
patch
|
blob
|
history
diff --git
a/drivers/clk/rockchip/clk-rk3036.c
b/drivers/clk/rockchip/clk-rk3036.c
index
924f560
..
dcde70f
100644
(file)
--- a/
drivers/clk/rockchip/clk-rk3036.c
+++ b/
drivers/clk/rockchip/clk-rk3036.c
@@
-127,7
+127,7
@@
PNAME(mux_ddrphy_p) = { "dpll_ddr", "gpll_ddr" };
PNAME(mux_pll_src_3plls_p) = { "apll", "dpll", "gpll" };
PNAME(mux_timer_p) = { "xin24m", "pclk_peri_src" };
-PNAME(mux_pll_src_apll_dpll_gpll_usb480m_p) = { "apll", "dpll", "gpll" "usb480m" };
+PNAME(mux_pll_src_apll_dpll_gpll_usb480m_p) = { "apll", "dpll", "gpll"
,
"usb480m" };
PNAME(mux_mmc_src_p) = { "apll", "dpll", "gpll", "xin24m" };
PNAME(mux_i2s_pre_p) = { "i2s_src", "i2s_frac", "ext_i2s", "xin12m" };