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

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

diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index c309593abdb223e9c9499c0469f080344ea40fd7..c611f489bdd25c0b3aa8b1c04bf94ad6f2b7554a 100644 (file)
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -38,7 +38,6 @@
 #include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
-#include <asm/hardware/arm_timer.h>
 #include <asm/hardware/icst.h>
 
 #include <asm/mach/arch.h>
@@ -381,10 +380,10 @@ void __init realview_timer_init(unsigned int timer_irq)
        /*
         * 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, timer_irq, "timer0");