From b3f75afaf4bdcdfb32a45ade110fdd42c9437cd7 Mon Sep 17 00:00:00 2001 From: Sebastien Jan Date: Fri, 25 Mar 2011 12:57:26 +0530 Subject: [PATCH] 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 Signed-off-by: Anand Gadiyar --- board/omap4430panda/omap4430panda.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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; -- 2.39.5