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

[kvmfornfv.git] / kernel / arch / arm / mach-ixp4xx / common.c

diff --git a/kernel/arch/arm/mach-ixp4xx/common.c b/kernel/arch/arm/mach-ixp4xx/common.c
index 8537d4c..1cb6f2f 100644 (file)
--- a/kernel/arch/arm/mach-ixp4xx/common.c
+++ b/kernel/arch/arm/mach-ixp4xx/common.c
@@ -296,7 +296,7 @@ void __init ixp4xx_init_irq(void)
        for(i = 0; i < NR_IRQS; i++) {
                irq_set_chip_and_handler(i, &ixp4xx_irq_chip,
                                         handle_level_irq);
-               set_irq_flags(i, IRQF_VALID);
+               irq_clear_status_flags(i, IRQ_NOREQUEST);
        }
 }
 
@@ -521,43 +521,55 @@ static int ixp4xx_set_next_event(unsigned long evt,
        return 0;
 }
 
-static void ixp4xx_set_mode(enum clock_event_mode mode,
-                           struct clock_event_device *evt)
+static int ixp4xx_shutdown(struct clock_event_device *evt)
 {
        unsigned long opts = *IXP4XX_OSRT1 & IXP4XX_OST_RELOAD_MASK;
        unsigned long osrt = *IXP4XX_OSRT1 & ~IXP4XX_OST_RELOAD_MASK;
 
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               osrt = IXP4XX_LATCH & ~IXP4XX_OST_RELOAD_MASK;
-               opts = IXP4XX_OST_ENABLE;
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
-               /* period set by 'set next_event' */
-               osrt = 0;
-               opts = IXP4XX_OST_ENABLE | IXP4XX_OST_ONE_SHOT;
-               break;
-       case CLOCK_EVT_MODE_SHUTDOWN:
-               opts &= ~IXP4XX_OST_ENABLE;
-               break;
-       case CLOCK_EVT_MODE_RESUME:
-               opts |= IXP4XX_OST_ENABLE;
-               break;
-       case CLOCK_EVT_MODE_UNUSED:
-       default:
-               osrt = opts = 0;
-               break;
-       }
+       opts &= ~IXP4XX_OST_ENABLE;
+       *IXP4XX_OSRT1 = osrt | opts;
+       return 0;
+}
 
+static int ixp4xx_set_oneshot(struct clock_event_device *evt)
+{
+       unsigned long opts = IXP4XX_OST_ENABLE | IXP4XX_OST_ONE_SHOT;
+       unsigned long osrt = 0;
+
+       /* period set by 'set next_event' */
        *IXP4XX_OSRT1 = osrt | opts;
+       return 0;
+}
+
+static int ixp4xx_set_periodic(struct clock_event_device *evt)
+{
+       unsigned long opts = IXP4XX_OST_ENABLE;
+       unsigned long osrt = IXP4XX_LATCH & ~IXP4XX_OST_RELOAD_MASK;
+
+       *IXP4XX_OSRT1 = osrt | opts;
+       return 0;
+}
+
+static int ixp4xx_resume(struct clock_event_device *evt)
+{
+       unsigned long opts = *IXP4XX_OSRT1 & IXP4XX_OST_RELOAD_MASK;
+       unsigned long osrt = *IXP4XX_OSRT1 & ~IXP4XX_OST_RELOAD_MASK;
+
+       opts |= IXP4XX_OST_ENABLE;
+       *IXP4XX_OSRT1 = osrt | opts;
+       return 0;
 }
 
 static struct clock_event_device clockevent_ixp4xx = {
-       .name           = "ixp4xx timer1",
-       .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-       .rating         = 200,
-       .set_mode       = ixp4xx_set_mode,
-       .set_next_event = ixp4xx_set_next_event,
+       .name                   = "ixp4xx timer1",
+       .features               = CLOCK_EVT_FEAT_PERIODIC |
+                                 CLOCK_EVT_FEAT_ONESHOT,
+       .rating                 = 200,
+       .set_state_shutdown     = ixp4xx_shutdown,
+       .set_state_periodic     = ixp4xx_set_periodic,
+       .set_state_oneshot      = ixp4xx_set_oneshot,
+       .tick_resume            = ixp4xx_resume,
+       .set_next_event         = ixp4xx_set_next_event,
 };
 
 static void __init ixp4xx_clockevent_init(void)