Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / arch / arm / mach-rockchip / rk3368-board-spl.c

diff --git a/arch/arm/mach-rockchip/rk3368-board-spl.c b/arch/arm/mach-rockchip/rk3368-board-spl.c
index 691db417571e39f25b0785944920b90c630ff68d..72d2c97d36367a8df193feb4a9f01344a095501d 100644 (file)
--- a/arch/arm/mach-rockchip/rk3368-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3368-board-spl.c
@@ -19,23 +19,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-/*
- * The ARMv8 generic timer uses the STIMER1 as its clock-source.
- * Set up the STIMER1 to free-running (i.e. auto-reload) to start
- * the generic timer counting (if we don't do this, udelay will not
- * work and block indefinitively).
- */
-static void secure_timer_init(void)
-{
-       struct rk_timer * const stimer1 =
-               (struct rk_timer * const)0xff830020;
-       const u32 TIMER_EN = BIT(0);
-
-       writel(~0u, &stimer1->timer_load_count0);
-       writel(~0u, &stimer1->timer_load_count1);
-       writel(TIMER_EN, &stimer1->timer_ctrl_reg);
-}
-
 void board_debug_uart_init(void)
 {
 }
@@ -52,19 +35,16 @@ void board_init_f(ulong dummy)
                hang();
        }
 
-       /* Make sure the ARMv8 generic timer counts */
-       secure_timer_init();
-
        /* Set up our preloader console */
        ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
        if (ret) {
-               error("%s: pinctrl init failed: %d\n", __func__, ret);
+               pr_err("%s: pinctrl init failed: %d\n", __func__, ret);
                hang();
        }
 
        ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_UART0);
        if (ret) {
-               error("%s: failed to set up console UART\n", __func__);
+               pr_err("%s: failed to set up console UART\n", __func__);
                hang();
        }