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

[kvmfornfv.git] / kernel / arch / arm / mach-omap1 / time.c

diff --git a/kernel/arch/arm/mach-omap1/time.c b/kernel/arch/arm/mach-omap1/time.c
index a7588cf..524977a 100644 (file)
--- a/kernel/arch/arm/mach-omap1/time.c
+++ b/kernel/arch/arm/mach-omap1/time.c
@@ -124,29 +124,26 @@ static int omap_mpu_set_next_event(unsigned long cycles,
        return 0;
 }
 
-static void omap_mpu_set_mode(enum clock_event_mode mode,
-                             struct clock_event_device *evt)
+static int omap_mpu_set_oneshot(struct clock_event_device *evt)
 {
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               omap_mpu_set_autoreset(0);
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
-               omap_mpu_timer_stop(0);
-               omap_mpu_remove_autoreset(0);
-               break;
-       case CLOCK_EVT_MODE_UNUSED:
-       case CLOCK_EVT_MODE_SHUTDOWN:
-       case CLOCK_EVT_MODE_RESUME:
-               break;
-       }
+       omap_mpu_timer_stop(0);
+       omap_mpu_remove_autoreset(0);
+       return 0;
+}
+
+static int omap_mpu_set_periodic(struct clock_event_device *evt)
+{
+       omap_mpu_set_autoreset(0);
+       return 0;
 }
 
 static struct clock_event_device clockevent_mpu_timer1 = {
-       .name           = "mpu_timer1",
-       .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-       .set_next_event = omap_mpu_set_next_event,
-       .set_mode       = omap_mpu_set_mode,
+       .name                   = "mpu_timer1",
+       .features               = CLOCK_EVT_FEAT_PERIODIC |
+                                 CLOCK_EVT_FEAT_ONESHOT,
+       .set_next_event         = omap_mpu_set_next_event,
+       .set_state_periodic     = omap_mpu_set_periodic,
+       .set_state_oneshot      = omap_mpu_set_oneshot,
 };
 
 static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id)