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

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

diff --git a/kernel/arch/arm/mach-omap1/timer32k.c b/kernel/arch/arm/mach-omap1/timer32k.c
index 36bf174..0ae6c52 100644 (file)
--- a/kernel/arch/arm/mach-omap1/timer32k.c
+++ b/kernel/arch/arm/mach-omap1/timer32k.c
@@ -114,29 +114,28 @@ static int omap_32k_timer_set_next_event(unsigned long delta,
        return 0;
 }
 
-static void omap_32k_timer_set_mode(enum clock_event_mode mode,
-                                   struct clock_event_device *evt)
+static int omap_32k_timer_shutdown(struct clock_event_device *evt)
 {
        omap_32k_timer_stop();
+       return 0;
+}
 
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               omap_32k_timer_start(OMAP_32K_TIMER_TICK_PERIOD);
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
-       case CLOCK_EVT_MODE_UNUSED:
-       case CLOCK_EVT_MODE_SHUTDOWN:
-               break;
-       case CLOCK_EVT_MODE_RESUME:
-               break;
-       }
+static int omap_32k_timer_set_periodic(struct clock_event_device *evt)
+{
+       omap_32k_timer_stop();
+       omap_32k_timer_start(OMAP_32K_TIMER_TICK_PERIOD);
+       return 0;
 }
 
 static struct clock_event_device clockevent_32k_timer = {
-       .name           = "32k-timer",
-       .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-       .set_next_event = omap_32k_timer_set_next_event,
-       .set_mode       = omap_32k_timer_set_mode,
+       .name                   = "32k-timer",
+       .features               = CLOCK_EVT_FEAT_PERIODIC |
+                                 CLOCK_EVT_FEAT_ONESHOT,
+       .set_next_event         = omap_32k_timer_set_next_event,
+       .set_state_shutdown     = omap_32k_timer_shutdown,
+       .set_state_periodic     = omap_32k_timer_set_periodic,
+       .set_state_oneshot      = omap_32k_timer_shutdown,
+       .tick_resume            = omap_32k_timer_shutdown,
 };
 
 static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id)