arm: mvebu: Remove timer.c

Since the move to CONFIG_TIMER with support for CONFIG_TIMER_EARLY, this
platform specific init_timer() function is not needed any more. Let's
remove it completely.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Michael Walle <michael@walle.cc>
Cc: Pali Rohár <pali@kernel.org>

diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
index 103e64cf2047d6a368791d19ff5b0e75c278e47a..406a9ee8f6862bca20b998659493df564b1e1a78 100644 (file)
--- a/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@ -16,10 +16,6 @@ obj-y        = dram.o
 obj-y  += gpio.o
 obj-y  += mbus.o
 
-ifndef CONFIG_TIMER
-obj-y  += timer.o
-endif
-
 else # CONFIG_ARCH_KIRKWOOD
 
 obj-y  = cpu.o
@@ -97,7 +93,6 @@ $(obj)/kwbimage.cfg: $(src)/kwbimage.cfg.in include/autoconf.mk \
 endif # CONFIG_SPL_BUILD
 obj-y  += gpio.o
 obj-y  += mbus.o
-obj-y  += timer.o
 obj-$(CONFIG_SPL_BUILD) += spl.o
 obj-$(CONFIG_SPL_BUILD) += lowlevel_spl.o
 

diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
index ca2d5a59d77307062b570f89a144a109f9931bfc..424599286e5e1b18ed9936dc3797672b62430d7b 100644 (file)
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -340,8 +340,6 @@ void board_init_f(ulong dummy)
 
        preloader_console_init();
 
-       timer_init();
-
        /* Armada 375 does not support SerDes and DDR3 init yet */
 #if !defined(CONFIG_ARMADA_375)
        /* First init the serdes PHY's */

diff --git a/arch/arm/mach-mvebu/timer.c b/arch/arm/mach-mvebu/timer.c
deleted file mode 100644 (file)
index 557a378..0000000
--- a/arch/arm/mach-mvebu/timer.c
+++ /dev/null
@@ -1,41 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) Marvell International Ltd. and its affiliates
- * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
- *
- * Copyright (C) 2015 Stefan Roese <sr@denx.de>
- */
-
-#include <common.h>
-#include <init.h>
-#include <asm/io.h>
-#include <asm/arch/soc.h>
-#include <linux/bitops.h>
-
-#define TIMER_LOAD_VAL                 0xffffffff
-
-static int init_done __section(".data") = 0;
-
-/*
- * Timer initialization
- */
-int timer_init(void)
-{
-       /* Only init the timer once */
-       if (init_done)
-               return 0;
-       init_done = 1;
-
-       /* load value into timer */
-       writel(TIMER_LOAD_VAL, MVEBU_TIMER_BASE + 0x10);
-       writel(TIMER_LOAD_VAL, MVEBU_TIMER_BASE + 0x14);
-
-#if defined(CONFIG_ARCH_MVEBU)
-       /* On Armada XP / 38x ..., the 25MHz clock source needs to be enabled */
-       setbits_le32(MVEBU_TIMER_BASE + 0x00, BIT(11));
-#endif
-       /* enable timer in auto reload mode */
-       setbits_le32(MVEBU_TIMER_BASE + 0x00, 0x3);
-
-       return 0;
-}