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

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

diff --git a/kernel/arch/arm/mach-davinci/time.c b/kernel/arch/arm/mach-davinci/time.c
index 160c960..6c18445 100644 (file)
--- a/kernel/arch/arm/mach-davinci/time.c
+++ b/kernel/arch/arm/mach-davinci/time.c
@@ -303,36 +303,42 @@ static int davinci_set_next_event(unsigned long cycles,
        return 0;
 }
 
-static void davinci_set_mode(enum clock_event_mode mode,
-                            struct clock_event_device *evt)
+static int davinci_shutdown(struct clock_event_device *evt)
 {
        struct timer_s *t = &timers[TID_CLOCKEVENT];
 
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               t->period = davinci_clock_tick_rate / (HZ);
-               t->opts &= ~TIMER_OPTS_STATE_MASK;
-               t->opts |= TIMER_OPTS_PERIODIC;
-               timer32_config(t);
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
-               t->opts &= ~TIMER_OPTS_STATE_MASK;
-               t->opts |= TIMER_OPTS_ONESHOT;
-               break;
-       case CLOCK_EVT_MODE_UNUSED:
-       case CLOCK_EVT_MODE_SHUTDOWN:
-               t->opts &= ~TIMER_OPTS_STATE_MASK;
-               t->opts |= TIMER_OPTS_DISABLED;
-               break;
-       case CLOCK_EVT_MODE_RESUME:
-               break;
-       }
+       t->opts &= ~TIMER_OPTS_STATE_MASK;
+       t->opts |= TIMER_OPTS_DISABLED;
+       return 0;
+}
+
+static int davinci_set_oneshot(struct clock_event_device *evt)
+{
+       struct timer_s *t = &timers[TID_CLOCKEVENT];
+
+       t->opts &= ~TIMER_OPTS_STATE_MASK;
+       t->opts |= TIMER_OPTS_ONESHOT;
+       return 0;
+}
+
+static int davinci_set_periodic(struct clock_event_device *evt)
+{
+       struct timer_s *t = &timers[TID_CLOCKEVENT];
+
+       t->period = davinci_clock_tick_rate / (HZ);
+       t->opts &= ~TIMER_OPTS_STATE_MASK;
+       t->opts |= TIMER_OPTS_PERIODIC;
+       timer32_config(t);
+       return 0;
 }
 
 static struct clock_event_device clockevent_davinci = {
-       .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-       .set_next_event = davinci_set_next_event,
-       .set_mode       = davinci_set_mode,
+       .features               = CLOCK_EVT_FEAT_PERIODIC |
+                                 CLOCK_EVT_FEAT_ONESHOT,
+       .set_next_event         = davinci_set_next_event,
+       .set_state_shutdown     = davinci_shutdown,
+       .set_state_periodic     = davinci_set_periodic,
+       .set_state_oneshot      = davinci_set_oneshot,
 };