ARM: davinci: enable the clocksource driver for DT mode

Switch all davinci boards supporting device tree to using the new
clocksource driver: remove the previous OF_TIMER_DECLARE() from
mach-davinci and select davinci-timer for ARCH_DAVINCI.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: David Lechner <david@lechnology.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 33b00579befff2d4ea0809965398f67cedb6fc77..92ff58be1a43eb6c62bbf77fd95610ca63e376a1 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -583,6 +583,7 @@ config ARCH_DAVINCI
        select ARCH_HAS_HOLES_MEMORYMODEL
        select COMMON_CLK
        select CPU_ARM926T
+       select DAVINCI_TIMER
        select GENERIC_ALLOCATOR
        select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP

diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c
index 5a6de5368ab08cb51351ffeac3493870613cadeb..740410a3bb6a5ae1b473fc1bd5aee4365d6f7559 100644 (file)
--- a/arch/arm/mach-davinci/time.c
+++ b/arch/arm/mach-davinci/time.c
@@ -398,17 +398,3 @@ void __init davinci_timer_init(struct clk *timer_clk)
        for (i=0; i< ARRAY_SIZE(timers); i++)
                timer32_config(&timers[i]);
 }
-
-static int __init of_davinci_timer_init(struct device_node *np)
-{
-       struct clk *clk;
-
-       clk = of_clk_get(np, 0);
-       if (IS_ERR(clk))
-               return PTR_ERR(clk);
-
-       davinci_timer_init(clk);
-
-       return 0;
-}
-TIMER_OF_DECLARE(davinci_timer, "ti,da830-timer", of_davinci_timer_init);