From 2919906b6bf869282e33c61e06aee5129ab4dbe8 Mon Sep 17 00:00:00 2001
From: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Date: Thu, 1 Dec 2011 21:13:02 +0100
Subject: [PATCH] --- yaml --- r: 276519 b: refs/heads/master c:
 6560ee07dc946e94f7cc2cd8e3b5a5f5ee7340c1 h: refs/heads/master i:   276517:
 312d00adaf1a09969661588e91094a8dddbb4777   276515:
 955ff350b06306d72ab9efbfaec488a72a21bf56   276511:
 a156f5cdef7467bf5dd38c4bf1ae1b63966ccc07 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/mach-omap1/clock_data.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 87b48abba907..32b3eef00e20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2cb211116192690605eaa70d39deb04241003e2
+refs/heads/master: 6560ee07dc946e94f7cc2cd8e3b5a5f5ee7340c1
diff --git a/trunk/arch/arm/mach-omap1/clock_data.c b/trunk/arch/arm/mach-omap1/clock_data.c
index 86b2dec11788..9ff90a744a21 100644
--- a/trunk/arch/arm/mach-omap1/clock_data.c
+++ b/trunk/arch/arm/mach-omap1/clock_data.c
@@ -16,6 +16,8 @@
 
 #include <linux/kernel.h>
 #include <linux/clk.h>
+#include <linux/cpufreq.h>
+#include <linux/delay.h>
 #include <linux/io.h>
 
 #include <asm/mach-types.h>  /* for machine_is_* */
@@ -927,7 +929,9 @@ int __init omap1_clk_init(void)
 
 void __init omap1_clk_late_init(void)
 {
-	if (ck_dpll1.rate >= OMAP1_DPLL1_SANE_VALUE)
+	unsigned long rate = ck_dpll1.rate;
+
+	if (rate >= OMAP1_DPLL1_SANE_VALUE)
 		return;
 
 	/* System booting at unusable rate, force reprogramming of DPLL1 */
@@ -942,4 +946,5 @@ void __init omap1_clk_late_init(void)
 	}
 	propagate_rate(&ck_dpll1);
 	omap1_show_rates();
+	loops_per_jiffy = cpufreq_scale(loops_per_jiffy, rate, ck_dpll1.rate);
 }