rk: revert 20f3d0b+v3.0.66 to v3.0

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-integrator / integrator_ap.c

diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index fcf0ae95651fd3c0fa3ce9f17f3c4b7d3cc55d15..2fbbdd5eac352bb4df44611894e4220e029f7903 100644 (file)
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -337,15 +337,15 @@ static unsigned long timer_reload;
 static void integrator_clocksource_init(u32 khz)
 {
        void __iomem *base = (void __iomem *)TIMER2_VA_BASE;
-       u32 ctrl = TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC;
+       u32 ctrl = TIMER_CTRL_ENABLE;
 
        if (khz >= 1500) {
                khz /= 16;
-               ctrl |= TIMER_CTRL_DIV16;
+               ctrl = TIMER_CTRL_DIV16;
        }
 
-       writel(0xffff, base + TIMER_LOAD);
        writel(ctrl, base + TIMER_CTRL);
+       writel(0xffff, base + TIMER_LOAD);
 
        clocksource_mmio_init(base + TIMER_VALUE, "timer2",
                khz * 1000, 200, 16, clocksource_mmio_readl_down);