These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / mach-lpc32xx / timer.c

diff --git a/kernel/arch/arm/mach-lpc32xx/timer.c b/kernel/arch/arm/mach-lpc32xx/timer.c
index 4e58372..ff3499d 100644 (file)
--- a/kernel/arch/arm/mach-lpc32xx/timer.c
+++ b/kernel/arch/arm/mach-lpc32xx/timer.c
@@ -43,36 +43,24 @@ static int lpc32xx_clkevt_next_event(unsigned long delta,
        return 0;
 }
 
-static void lpc32xx_clkevt_mode(enum clock_event_mode mode,
-    struct clock_event_device *dev)
+static int lpc32xx_shutdown(struct clock_event_device *evt)
 {
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               WARN_ON(1);
-               break;
-
-       case CLOCK_EVT_MODE_ONESHOT:
-       case CLOCK_EVT_MODE_SHUTDOWN:
-               /*
-                * Disable the timer. When using oneshot, we must also
-                * disable the timer to wait for the first call to
-                * set_next_event().
-                */
-               __raw_writel(0, LPC32XX_TIMER_TCR(LPC32XX_TIMER0_BASE));
-               break;
-
-       case CLOCK_EVT_MODE_UNUSED:
-       case CLOCK_EVT_MODE_RESUME:
-               break;
-       }
+       /*
+        * Disable the timer. When using oneshot, we must also
+        * disable the timer to wait for the first call to
+        * set_next_event().
+        */
+       __raw_writel(0, LPC32XX_TIMER_TCR(LPC32XX_TIMER0_BASE));
+       return 0;
 }
 
 static struct clock_event_device lpc32xx_clkevt = {
-       .name           = "lpc32xx_clkevt",
-       .features       = CLOCK_EVT_FEAT_ONESHOT,
-       .rating         = 300,
-       .set_next_event = lpc32xx_clkevt_next_event,
-       .set_mode       = lpc32xx_clkevt_mode,
+       .name                   = "lpc32xx_clkevt",
+       .features               = CLOCK_EVT_FEAT_ONESHOT,
+       .rating                 = 300,
+       .set_next_event         = lpc32xx_clkevt_next_event,
+       .set_state_shutdown     = lpc32xx_shutdown,
+       .set_state_oneshot      = lpc32xx_shutdown,
 };
 
 static irqreturn_t lpc32xx_timer_interrupt(int irq, void *dev_id)