Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[firefly-linux-kernel-4.4.55.git] / drivers / clocksource / time-armada-370-xp.c

diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index 0c8c5e3375407fad8c6f666c596d1b2c155acc04..2162796fd504fb15d9639bfec054a7ece427220b 100644 (file)
--- a/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@ -121,33 +121,33 @@ armada_370_xp_clkevt_next_event(unsigned long delta,
        return 0;
 }
 
-static void
-armada_370_xp_clkevt_mode(enum clock_event_mode mode,
-                         struct clock_event_device *dev)
+static int armada_370_xp_clkevt_shutdown(struct clock_event_device *evt)
 {
-       if (mode == CLOCK_EVT_MODE_PERIODIC) {
+       /*
+        * Disable timer.
+        */
+       local_timer_ctrl_clrset(TIMER0_EN, 0);
 
-               /*
-                * Setup timer to fire at 1/HZ intervals.
-                */
-               writel(ticks_per_jiffy - 1, local_base + TIMER0_RELOAD_OFF);
-               writel(ticks_per_jiffy - 1, local_base + TIMER0_VAL_OFF);
+       /*
+        * ACK pending timer interrupt.
+        */
+       writel(TIMER0_CLR_MASK, local_base + LCL_TIMER_EVENTS_STATUS);
+       return 0;
+}
 
-               /*
-                * Enable timer.
-                */
-               local_timer_ctrl_clrset(0, TIMER0_RELOAD_EN | enable_mask);
-       } else {
-               /*
-                * Disable timer.
-                */
-               local_timer_ctrl_clrset(TIMER0_EN, 0);
+static int armada_370_xp_clkevt_set_periodic(struct clock_event_device *evt)
+{
+       /*
+        * Setup timer to fire at 1/HZ intervals.
+        */
+       writel(ticks_per_jiffy - 1, local_base + TIMER0_RELOAD_OFF);
+       writel(ticks_per_jiffy - 1, local_base + TIMER0_VAL_OFF);
 
-               /*
-                * ACK pending timer interrupt.
-                */
-               writel(TIMER0_CLR_MASK, local_base + LCL_TIMER_EVENTS_STATUS);
-       }
+       /*
+        * Enable timer.
+        */
+       local_timer_ctrl_clrset(0, TIMER0_RELOAD_EN | enable_mask);
+       return 0;
 }
 
 static int armada_370_xp_clkevt_irq;
@@ -185,7 +185,10 @@ static int armada_370_xp_timer_setup(struct clock_event_device *evt)
        evt->shift              = 32,
        evt->rating             = 300,
        evt->set_next_event     = armada_370_xp_clkevt_next_event,
-       evt->set_mode           = armada_370_xp_clkevt_mode,
+       evt->set_state_shutdown = armada_370_xp_clkevt_shutdown;
+       evt->set_state_periodic = armada_370_xp_clkevt_set_periodic;
+       evt->set_state_oneshot  = armada_370_xp_clkevt_shutdown;
+       evt->tick_resume        = armada_370_xp_clkevt_shutdown;
        evt->irq                = armada_370_xp_clkevt_irq;
        evt->cpumask            = cpumask_of(cpu);
 
@@ -197,7 +200,7 @@ static int armada_370_xp_timer_setup(struct clock_event_device *evt)
 
 static void armada_370_xp_timer_stop(struct clock_event_device *evt)
 {
-       evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
+       evt->set_state_shutdown(evt);
        disable_percpu_irq(evt->irq);
 }