These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / arch / mips / kernel / cevt-ds1287.c
index ff1f01b..77a5ddf 100644 (file)
@@ -59,27 +59,32 @@ static int ds1287_set_next_event(unsigned long delta,
        return -EINVAL;
 }
 
-static void ds1287_set_mode(enum clock_event_mode mode,
-                           struct clock_event_device *evt)
+static int ds1287_shutdown(struct clock_event_device *evt)
 {
        u8 val;
 
        spin_lock(&rtc_lock);
 
        val = CMOS_READ(RTC_REG_B);
+       val &= ~RTC_PIE;
+       CMOS_WRITE(val, RTC_REG_B);
 
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               val |= RTC_PIE;
-               break;
-       default:
-               val &= ~RTC_PIE;
-               break;
-       }
+       spin_unlock(&rtc_lock);
+       return 0;
+}
 
+static int ds1287_set_periodic(struct clock_event_device *evt)
+{
+       u8 val;
+
+       spin_lock(&rtc_lock);
+
+       val = CMOS_READ(RTC_REG_B);
+       val |= RTC_PIE;
        CMOS_WRITE(val, RTC_REG_B);
 
        spin_unlock(&rtc_lock);
+       return 0;
 }
 
 static void ds1287_event_handler(struct clock_event_device *dev)
@@ -87,11 +92,13 @@ static void ds1287_event_handler(struct clock_event_device *dev)
 }
 
 static struct clock_event_device ds1287_clockevent = {
-       .name           = "ds1287",
-       .features       = CLOCK_EVT_FEAT_PERIODIC,
-       .set_next_event = ds1287_set_next_event,
-       .set_mode       = ds1287_set_mode,
-       .event_handler  = ds1287_event_handler,
+       .name                   = "ds1287",
+       .features               = CLOCK_EVT_FEAT_PERIODIC,
+       .set_next_event         = ds1287_set_next_event,
+       .set_state_shutdown     = ds1287_shutdown,
+       .set_state_periodic     = ds1287_set_periodic,
+       .tick_resume            = ds1287_shutdown,
+       .event_handler          = ds1287_event_handler,
 };
 
 static irqreturn_t ds1287_interrupt(int irq, void *dev_id)