From: Sebastien Jan <s-jan@ti.com>
Date: Fri, 25 Mar 2011 07:27:26 +0000 (+0530)
Subject: panda: fix 1GHz configuration
X-Git-Tag: v1.5.1~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3f75afaf4bdcdfb32a45ade110fdd42c9437cd7;p=pandora-x-loader.git

panda: fix 1GHz configuration

With the introduction of the following patch:
97bb3ce xloader: Panda - fix ROM OTG boot path
prcm_init() is called earlier, but before scale_vcores().

This breaks when CONFIG_MPU_1000 is activated, so ensure that scale_vcores
is called before prcm_init().

Signed-off-by: Sebastien Jan <s-jan@ti.com>
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
---

diff --git a/board/omap4430panda/omap4430panda.c b/board/omap4430panda/omap4430panda.c
index 9f16e56..962820b 100644
--- a/board/omap4430panda/omap4430panda.c
+++ b/board/omap4430panda/omap4430panda.c
@@ -689,6 +689,11 @@ void s_init(void)
 	 * this is required to survive the muxconf in the case the ROM
 	 * started up USB OTG
 	 */
+/* Set VCORE1 = 1.3 V, VCORE2 = VCORE3 = 1.21V */
+#if defined(CONFIG_MPU_600) || defined(CONFIG_MPU_1000)
+	scale_vcores();
+#endif
+
 	prcm_init();
 
 	set_muxconf_regs();
@@ -703,11 +708,6 @@ void s_init(void)
 
 	ddr_init();
 
-/* Set VCORE1 = 1.3 V, VCORE2 = VCORE3 = 1.21V */
-#if defined(CONFIG_MPU_600) || defined(CONFIG_MPU_1000)
-	scale_vcores();
-#endif
-
 	if (rev == OMAP4430_ES1_0)
 		return;