ARM: OMAP2: Keep both APLLs active during bootup

Enabling and disabling the 54 MHz and 96 MHz APLLs can happen
unnecessarily often during bootup. Make sure they're kept
enabled during init.

Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 737aca4cff136f43711a64753f2ce72147e2ee4d..eee273bdd19187187672d27b6c0354a1d28df99a 100644 (file)
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -1117,6 +1117,12 @@ int __init omap2_clk_init(void)
         */
        clk_enable(&sync_32k_ick);
        clk_enable(&omapctrl_ick);
+
+       /* Force the APLLs active during bootup to avoid disabling and
+        * enabling them unnecessarily. */
+       clk_enable(&apll96_ck);
+       clk_enable(&apll54_ck);
+
        if (cpu_is_omap2430())
                clk_enable(&sdrc_ick);
 
@@ -1126,3 +1132,12 @@ int __init omap2_clk_init(void)
 
        return 0;
 }
+
+static int __init omap2_disable_aplls(void)
+{
+       clk_disable(&apll96_ck);
+       clk_disable(&apll54_ck);
+
+       return 0;
+}
+late_initcall(omap2_disable_aplls);