summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2014-05-10 05:33:40 +0200
committerMaxime Ripard <maxime.ripard@free-electrons.com>2014-06-11 10:25:01 +0200
commit2df73f40dc5af46eabcc3f144d19842cd69361cd (patch)
tree4ce80641abec950b0ccac952c732dfae852b6657
parentclk: sunxi: Rework clock protection code (diff)
downloadlinux-2df73f40dc5af46eabcc3f144d19842cd69361cd.tar.xz
linux-2df73f40dc5af46eabcc3f144d19842cd69361cd.zip
clk: sun6i: Protect CPU clock
Right now, AHB is an indirect child clock of the CPU clock. If that happens to change, since the CPU clock has no other consumers declared in Linux, it would be shut down, which is not really a good idea. Prevent this by forcing it enabled. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Mike Turquette <mturquette@linaro.org> Signed-off-by: Emilio López <emilio@elopez.com.ar>
-rw-r--r--drivers/clk/sunxi/clk-sunxi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 4e8ff4565e59..f76f2327e0e4 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -1226,6 +1226,7 @@ CLK_OF_DECLARE(sun5i_a13_clk_init, "allwinner,sun5i-a13", sun5i_init_clocks);
CLK_OF_DECLARE(sun7i_a20_clk_init, "allwinner,sun7i-a20", sun5i_init_clocks);
static const char *sun6i_critical_clocks[] __initdata = {
+ "cpu",
};
static void __init sun6i_init_clocks(struct device_node *node)