arm: mvebu: Use CONFIG_TIMER on all MVEBU & KIRKWOOD platforms

Now that the new timer support is available for these platforms, let's
select this IF for all these platforms. This way it's not necessary
that each board changes it's config header.

Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Tony Dinh <mibodhi@gmail.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f3a3c0f9a9f431e763e222e4491b41a29cc869fc..9a6c2e8101dceec3eb88374acdca3c6ab4d99d05 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -627,6 +627,7 @@ config ARCH_KIRKWOOD
        select BOARD_EARLY_INIT_F
        select CPU_ARM926EJS
        select GPIO_EXTRA_HEADER
+       select TIMER
 
 config ARCH_MVEBU
        bool "Marvell MVEBU family (Armada XP/375/38x/3700/7K/8K)"
@@ -638,6 +639,8 @@ config ARCH_MVEBU
        select GPIO_EXTRA_HEADER
        select SPL_DM_SPI if SPL
        select SPL_DM_SPI_FLASH if SPL
+       select SPL_TIMER if SPL
+       select TIMER
        select OF_CONTROL
        select OF_SEPARATE
        select SPI
@@ -648,6 +651,7 @@ config ARCH_ORION5X
        select CPU_ARM926EJS
        select GPIO_EXTRA_HEADER
        select SPL_SEPARATE_BSS if SPL
+       select TIMER
 
 config TARGET_STV0991
        bool "Support stv0991"

diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h
index 0bba0a4cf9b4542122a4ef077367113f52305d3d..2e06f2bdaee3eefdce02db8fefaf39ae0fa88a42 100644 (file)
--- a/arch/arm/mach-mvebu/include/mach/config.h
+++ b/arch/arm/mach-mvebu/include/mach/config.h
@@ -39,9 +39,4 @@
 #endif
 #endif
 
-/* Use common timer */
-#define CONFIG_SYS_TIMER_COUNTS_DOWN
-#define CONFIG_SYS_TIMER_COUNTER       (MVEBU_TIMER_BASE + 0x14)
-#define CONFIG_SYS_TIMER_RATE          25000000
-
 #endif /* __MVEBU_CONFIG_H */