From: Dechesne, Nicolas <n-dechesne@ti.com>
Date: Tue, 31 Jan 2012 07:35:40 +0000 (+0000)
Subject: OMAP SPL: Fix missing timer_init() call in OMAP4 s_init()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f59021791b5a09b22c886aa6c1115cd49b730d6c;p=project%2Fbcm63xx%2Fu-boot.git

OMAP SPL: Fix missing timer_init() call in OMAP4 s_init()

In 8775471bb, the call to timer_init() was removed from common code
and put in OMAP3 s_init() function. As a result the boot was broken
on OMAP4. This patch adds timer_init() in OMAP4 s_init(), that fix
boot on all OMAP4 boards.

Signed-off-by: Nicolas Dechesne <n-dechesne@ti.com>
Tested-by: Robert P. J. Day <rpjday@crashcourse.ca>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Tom Rini <trini@ti.com>
---

diff --git a/arch/arm/cpu/armv7/omap-common/hwinit-common.c b/arch/arm/cpu/armv7/omap-common/hwinit-common.c
index 49cdc3936e..ab46bff5af 100644
--- a/arch/arm/cpu/armv7/omap-common/hwinit-common.c
+++ b/arch/arm/cpu/armv7/omap-common/hwinit-common.c
@@ -120,6 +120,8 @@ void s_init(void)
 #endif
 	prcm_init();
 #ifdef CONFIG_SPL_BUILD
+	timer_init();
+
 	/* For regular u-boot sdram_init() is called from dram_init() */
 	sdram_init();
 	init_boot_params();