highbank: switch to use the Arm SP804 DM_TIMER driver

So far the Calxeda machines were using the CONFIG_SYS_TIMER_* macros to
simply hardcode the address of the counter register of the SP804 timer.
This method is deprecated and scheduled for removal.

Use the newly introduced SP804 DM_TIMER driver to provide timer
functionality on Highbank and Midway machines. The base address and base
frequency are taken from the devicetree.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 710f171f87e5c6b635fba7d01205f3dcd623afe3..453bef900e819dbb71c4c758ab81f89b84426581 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -769,6 +769,8 @@ config ARCH_HIGHBANK
        select AHCI
        select DM_ETH
        select PHYS_64BIT
+       select TIMER
+       select SP804_TIMER
        imply OF_HAS_PRIOR_STAGE
 
 config ARCH_INTEGRATOR

diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index bb6cc957261a82a6ee15eaf6a637b8264169244d..5e2b50bbac10c69e29c4fbe2224c4cbf269a5ae9 100644 (file)
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -8,10 +8,6 @@
 
 #define CONFIG_SYS_BOOTMAPSZ           (16 << 20)
 
-#define CONFIG_SYS_TIMER_RATE          (150000000/256)
-#define CONFIG_SYS_TIMER_COUNTER       (0xFFF34000 + 0x4)
-#define CONFIG_SYS_TIMER_COUNTS_DOWN
-
 #define CONFIG_PL011_CLOCK             150000000
 
 /*