summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-12-19 16:52:54 -0500
committerTom Rini <trini@ti.com>2015-01-05 15:13:45 -0500
commitb352dde1ea715e8481946ec7d8086b3c3eb126ae (patch)
tree72f78da63e6f4919703322252eed2a183bfd413a
parent57b5e43e95815387de7b110bf469c5650544963e (diff)
downloadtalos-obmc-uboot-b352dde1ea715e8481946ec7d8086b3c3eb126ae.tar.gz
talos-obmc-uboot-b352dde1ea715e8481946ec7d8086b3c3eb126ae.zip
am33xx: Drop timer_init call from s_init
In both SPL and non-SPL cases we will make a call to timer_init() early on and do not need to call it again within s_init(). Signed-off-by: Tom Rini <trini@ti.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/arm/cpu/armv7/am33xx/board.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c
index 29b1d73438..eaf09d1a62 100644
--- a/arch/arm/cpu/armv7/am33xx/board.c
+++ b/arch/arm/cpu/armv7/am33xx/board.c
@@ -294,7 +294,6 @@ void s_init(void)
save_omap_boot_params();
#endif
watchdog_disable();
- timer_init();
set_uart_mux_conf();
setup_clocks_for_console();
uart_soft_reset();
OpenPOWER on IntegriCloud