From e74a23dbea1e43175f63e901f7c66e5a5c2860d8 Mon Sep 17 00:00:00 2001
From: Juha Yrjola <juha.yrjola@solidboot.com>
Date: Wed, 6 Dec 2006 17:13:47 -0800
Subject: [PATCH] --- yaml --- r: 64575 b: refs/heads/master c:
 1abc70fcd81b920dd7a1091ba8863dfe5463b130 h: refs/heads/master i:   64573:
 ad4063dd197f00ee6ae568c5d3312df95d3501ef   64571:
 47847923b7d3408d7d3052859ac04a4a35d45ada   64567:
 607b9539debdcf7538ee6f5a7b05bca5784095e0   64559:
 fc23274f73f962d24c0394c9f23b7f85300b1479   64543:
 07be55ae4ab00d72e46951fe3f6e2b6988726104   64511:
 c3008c10cc12a0d226a77b8a17719b53710bd4cb v: v3

---
 [refs]                            |  2 +-
 trunk/arch/arm/mach-omap2/clock.c | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 1685ed46a116..5cf564c69ac2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 666cd174c451c172dd115b9d94f150efe627b609
+refs/heads/master: 1abc70fcd81b920dd7a1091ba8863dfe5463b130
diff --git a/trunk/arch/arm/mach-omap2/clock.c b/trunk/arch/arm/mach-omap2/clock.c
index 588adb5ab47f..d9af4367f8bb 100644
--- a/trunk/arch/arm/mach-omap2/clock.c
+++ b/trunk/arch/arm/mach-omap2/clock.c
@@ -1160,8 +1160,8 @@ 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. */
+	/* Force the APLLs always active. The clocks are idled
+	 * automatically by hardware. */
 	clk_enable(&apll96_ck);
 	clk_enable(&apll54_ck);
 
@@ -1174,12 +1174,3 @@ 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);