summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-rockchip/rk3368-board-spl.c20
-rw-r--r--arch/arm/mach-rockchip/rk3368-board-tpl.c19
2 files changed, 0 insertions, 39 deletions
diff --git a/arch/arm/mach-rockchip/rk3368-board-spl.c b/arch/arm/mach-rockchip/rk3368-board-spl.c
index 691db41757..cabf344486 100644
--- 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,9 +35,6 @@ 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) {
diff --git a/arch/arm/mach-rockchip/rk3368-board-tpl.c b/arch/arm/mach-rockchip/rk3368-board-tpl.c
index 1a69da2bd8..b3e6ffa781 100644
--- a/arch/arm/mach-rockchip/rk3368-board-tpl.c
+++ b/arch/arm/mach-rockchip/rk3368-board-tpl.c
@@ -21,23 +21,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);
-}
-
-/*
* The SPL (and also the full U-Boot stage on the RK3368) will run in
* secure mode (i.e. EL3) and an ATF will eventually be booted before
* starting up the operating system... so we can initialize the SGRF
@@ -153,8 +136,6 @@ void board_init_f(ulong dummy)
hang();
}
- /* Make sure the ARMv8 generic timer counts */
- secure_timer_init();
/* Reset security, so we can use DMA in the MMC drivers */
sgrf_init();