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

[kvmfornfv.git] / kernel / arch / arm / mach-imx / epit.c

diff --git a/kernel/arch/arm/mach-imx/epit.c b/kernel/arch/arm/mach-imx/epit.c
index 074b1a8..08ce207 100644 (file)
--- a/kernel/arch/arm/mach-imx/epit.c
+++ b/kernel/arch/arm/mach-imx/epit.c
@@ -57,7 +57,6 @@
 #include "hardware.h"
 
 static struct clock_event_device clockevent_epit;
-static enum clock_event_mode clockevent_mode = CLOCK_EVT_MODE_UNUSED;
 
 static void __iomem *timer_base;
 
@@ -106,8 +105,8 @@ static int epit_set_next_event(unsigned long evt,
        return 0;
 }
 
-static void epit_set_mode(enum clock_event_mode mode,
-                               struct clock_event_device *evt)
+/* Left event sources disabled, no more interrupts appear */
+static int epit_shutdown(struct clock_event_device *evt)
 {
        unsigned long flags;
 
@@ -120,39 +119,41 @@ static void epit_set_mode(enum clock_event_mode mode,
        /* Disable interrupt in GPT module */
        epit_irq_disable();
 
-       if (mode != clockevent_mode) {
-               /* Set event time into far-far future */
-
-               /* Clear pending interrupt */
-               epit_irq_acknowledge();
-       }
+       /* Clear pending interrupt */
+       epit_irq_acknowledge();
 
-       /* Remember timer mode */
-       clockevent_mode = mode;
        local_irq_restore(flags);
 
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               printk(KERN_ERR "epit_set_mode: Periodic mode is not "
-                               "supported for i.MX EPIT\n");
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
+       return 0;
+}
+
+static int epit_set_oneshot(struct clock_event_device *evt)
+{
+       unsigned long flags;
+
+       /*
+        * The timer interrupt generation is disabled at least
+        * for enough time to call epit_set_next_event()
+        */
+       local_irq_save(flags);
+
+       /* Disable interrupt in GPT module */
+       epit_irq_disable();
+
+       /* Clear pending interrupt, only while switching mode */
+       if (!clockevent_state_oneshot(evt))
+               epit_irq_acknowledge();
+
        /*
         * Do not put overhead of interrupt enable/disable into
         * epit_set_next_event(), the core has about 4 minutes
         * to call epit_set_next_event() or shutdown clock after
         * mode switching
         */
-               local_irq_save(flags);
-               epit_irq_enable();
-               local_irq_restore(flags);
-               break;
-       case CLOCK_EVT_MODE_SHUTDOWN:
-       case CLOCK_EVT_MODE_UNUSED:
-       case CLOCK_EVT_MODE_RESUME:
-               /* Left event sources disabled, no more interrupts appear */
-               break;
-       }
+       epit_irq_enable();
+       local_irq_restore(flags);
+
+       return 0;
 }
 
 /*
@@ -176,11 +177,13 @@ static struct irqaction epit_timer_irq = {
 };
 
 static struct clock_event_device clockevent_epit = {
-       .name           = "epit",
-       .features       = CLOCK_EVT_FEAT_ONESHOT,
-       .set_mode       = epit_set_mode,
-       .set_next_event = epit_set_next_event,
-       .rating         = 200,
+       .name                   = "epit",
+       .features               = CLOCK_EVT_FEAT_ONESHOT,
+       .set_state_shutdown     = epit_shutdown,
+       .tick_resume            = epit_shutdown,
+       .set_state_oneshot      = epit_set_oneshot,
+       .set_next_event         = epit_set_next_event,
+       .rating                 = 200,
 };
 
 static int __init epit_clockevent_init(struct clk *timer_clk)