]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
am33xx: Drop timer_init call from s_init
authorTom Rini <trini@ti.com>
Fri, 19 Dec 2014 21:52:54 +0000 (16:52 -0500)
committerTom Rini <trini@ti.com>
Mon, 5 Jan 2015 20:13:45 +0000 (15:13 -0500)
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>
arch/arm/cpu/armv7/am33xx/board.c

index 29b1d734382a3c8a83a41cad409a8b5b6e217d7e..eaf09d1a627746e0aea1c1317aa6a8ea390693ad 100644 (file)
@@ -294,7 +294,6 @@ void s_init(void)
        save_omap_boot_params();
 #endif
        watchdog_disable();
        save_omap_boot_params();
 #endif
        watchdog_disable();
-       timer_init();
        set_uart_mux_conf();
        setup_clocks_for_console();
        uart_soft_reset();
        set_uart_mux_conf();
        setup_clocks_for_console();
        uart_soft_reset();