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

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

diff --git a/kernel/arch/arm/mach-mmp/time.c b/kernel/arch/arm/mach-mmp/time.c
index 10bfa03..dbc697b 100644 (file)
--- a/kernel/arch/arm/mach-mmp/time.c
+++ b/kernel/arch/arm/mach-mmp/time.c
@@ -124,32 +124,25 @@ static int timer_set_next_event(unsigned long delta,
        return 0;
 }
 
-static void timer_set_mode(enum clock_event_mode mode,
-                          struct clock_event_device *dev)
+static int timer_set_shutdown(struct clock_event_device *evt)
 {
        unsigned long flags;
 
        local_irq_save(flags);
-       switch (mode) {
-       case CLOCK_EVT_MODE_ONESHOT:
-       case CLOCK_EVT_MODE_UNUSED:
-       case CLOCK_EVT_MODE_SHUTDOWN:
-               /* disable the matching interrupt */
-               __raw_writel(0x00, mmp_timer_base + TMR_IER(0));
-               break;
-       case CLOCK_EVT_MODE_RESUME:
-       case CLOCK_EVT_MODE_PERIODIC:
-               break;
-       }
+       /* disable the matching interrupt */
+       __raw_writel(0x00, mmp_timer_base + TMR_IER(0));
        local_irq_restore(flags);
+
+       return 0;
 }
 
 static struct clock_event_device ckevt = {
-       .name           = "clockevent",
-       .features       = CLOCK_EVT_FEAT_ONESHOT,
-       .rating         = 200,
-       .set_next_event = timer_set_next_event,
-       .set_mode       = timer_set_mode,
+       .name                   = "clockevent",
+       .features               = CLOCK_EVT_FEAT_ONESHOT,
+       .rating                 = 200,
+       .set_next_event         = timer_set_next_event,
+       .set_state_shutdown     = timer_set_shutdown,
+       .set_state_oneshot      = timer_set_shutdown,
 };
 
 static cycle_t clksrc_read(struct clocksource *cs)