diff options
author | Chen-Yu Tsai <wens@csie.org> | 2015-03-20 01:19:04 +0800 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-03-21 11:49:21 +0100 |
commit | 946fd40f2860bca61abb51676cf72b31ca79d3f8 (patch) | |
tree | 943fc2992d4bcc9c82c028d93686ba336daa5a23 /drivers/clk | |
parent | 9f2430973d6713b73b3d25990d0ceb77a12a13a6 (diff) | |
download | linux-stable-946fd40f2860bca61abb51676cf72b31ca79d3f8.tar.gz linux-stable-946fd40f2860bca61abb51676cf72b31ca79d3f8.tar.bz2 linux-stable-946fd40f2860bca61abb51676cf72b31ca79d3f8.zip |
clk: sunxi: Add "cpu" to list of protected clocks for sun5i
Now that the ahb clock on sun5i/sun7i is muxable, ahb is no longer
guaranteed to be a child of the cpu clock. Add the cpu clock to
the list of protected clocks so it doesn't get disabled.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/sunxi/clk-sunxi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index ae7b1c4d6aae..7580a1bc88fd 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -1349,6 +1349,7 @@ static void __init sun4i_a10_init_clocks(struct device_node *node) CLK_OF_DECLARE(sun4i_a10_clk_init, "allwinner,sun4i-a10", sun4i_a10_init_clocks); static const char *sun5i_critical_clocks[] __initdata = { + "cpu", "pll5_ddr", "ahb_sdram", }; |