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

[kvmfornfv.git] / kernel / drivers / clocksource / moxart_timer.c

diff --git a/kernel/drivers/clocksource/moxart_timer.c b/kernel/drivers/clocksource/moxart_timer.c
index 5eb2c35..19857af 100644 (file)
--- a/kernel/drivers/clocksource/moxart_timer.c
+++ b/kernel/drivers/clocksource/moxart_timer.c
@@ -58,25 +58,24 @@
 static void __iomem *base;
 static unsigned int clock_count_per_tick;
 
-static void moxart_clkevt_mode(enum clock_event_mode mode,
-                              struct clock_event_device *clk)
+static int moxart_shutdown(struct clock_event_device *evt)
 {
-       switch (mode) {
-       case CLOCK_EVT_MODE_RESUME:
-       case CLOCK_EVT_MODE_ONESHOT:
-               writel(TIMER1_DISABLE, base + TIMER_CR);
-               writel(~0, base + TIMER1_BASE + REG_LOAD);
-               break;
-       case CLOCK_EVT_MODE_PERIODIC:
-               writel(clock_count_per_tick, base + TIMER1_BASE + REG_LOAD);
-               writel(TIMER1_ENABLE, base + TIMER_CR);
-               break;
-       case CLOCK_EVT_MODE_UNUSED:
-       case CLOCK_EVT_MODE_SHUTDOWN:
-       default:
-               writel(TIMER1_DISABLE, base + TIMER_CR);
-               break;
-       }
+       writel(TIMER1_DISABLE, base + TIMER_CR);
+       return 0;
+}
+
+static int moxart_set_oneshot(struct clock_event_device *evt)
+{
+       writel(TIMER1_DISABLE, base + TIMER_CR);
+       writel(~0, base + TIMER1_BASE + REG_LOAD);
+       return 0;
+}
+
+static int moxart_set_periodic(struct clock_event_device *evt)
+{
+       writel(clock_count_per_tick, base + TIMER1_BASE + REG_LOAD);
+       writel(TIMER1_ENABLE, base + TIMER_CR);
+       return 0;
 }
 
 static int moxart_clkevt_next_event(unsigned long cycles,
@@ -95,11 +94,15 @@ static int moxart_clkevt_next_event(unsigned long cycles,
 }
 
 static struct clock_event_device moxart_clockevent = {
-       .name           = "moxart_timer",
-       .rating         = 200,
-       .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-       .set_mode       = moxart_clkevt_mode,
-       .set_next_event = moxart_clkevt_next_event,
+       .name                   = "moxart_timer",
+       .rating                 = 200,
+       .features               = CLOCK_EVT_FEAT_PERIODIC |
+                                 CLOCK_EVT_FEAT_ONESHOT,
+       .set_state_shutdown     = moxart_shutdown,
+       .set_state_periodic     = moxart_set_periodic,
+       .set_state_oneshot      = moxart_set_oneshot,
+       .tick_resume            = moxart_set_oneshot,
+       .set_next_event         = moxart_clkevt_next_event,
 };
 
 static irqreturn_t moxart_timer_interrupt(int irq, void *dev_id)