ARM: 8365/1: introduce sp804_timer_disable and remove arm_timer.h inclusion

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-versatile / core.c

diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 6ea09fe5342671f0d14a4f50803d3d03aa5ddf96..f98c1961be6a06ad429fc40f3daf06ade1e225cd 100644 (file)
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -42,7 +42,6 @@
 #include <linux/reboot.h>
 
 #include <asm/irq.h>
-#include <asm/hardware/arm_timer.h>
 #include <asm/hardware/icst.h>
 #include <asm/mach-types.h>
 
@@ -798,10 +797,10 @@ void __init versatile_timer_init(void)
        /*
         * Initialise to a known state (all timers off)
         */
-       writel(0, TIMER0_VA_BASE + TIMER_CTRL);
-       writel(0, TIMER1_VA_BASE + TIMER_CTRL);
-       writel(0, TIMER2_VA_BASE + TIMER_CTRL);
-       writel(0, TIMER3_VA_BASE + TIMER_CTRL);
+       sp804_timer_disable(TIMER0_VA_BASE);
+       sp804_timer_disable(TIMER1_VA_BASE);
+       sp804_timer_disable(TIMER2_VA_BASE);
+       sp804_timer_disable(TIMER3_VA_BASE);
 
        sp804_clocksource_init(TIMER3_VA_BASE, "timer3");
        sp804_clockevents_init(TIMER0_VA_BASE, IRQ_TIMERINT0_1, "timer0");