Merge branch 'for-4.3/sg' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / arch / arm / plat-iop / time.c

diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c
index d70b73364a3fe8a549407f51c0f8f35e786360d7..101e8f2c7abecce5647034818c3926f55f94c489 100644 (file)
--- a/arch/arm/plat-iop/time.c
+++ b/arch/arm/plat-iop/time.c
@@ -77,41 +77,57 @@ static int iop_set_next_event(unsigned long delta,
 
 static unsigned long ticks_per_jiffy;
 
-static void iop_set_mode(enum clock_event_mode mode,
-                        struct clock_event_device *unused)
+static int iop_set_periodic(struct clock_event_device *evt)
 {
        u32 tmr = read_tmr0();
 
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               write_tmr0(tmr & ~IOP_TMR_EN);
-               write_tcr0(ticks_per_jiffy - 1);
-               write_trr0(ticks_per_jiffy - 1);
-               tmr |= (IOP_TMR_RELOAD | IOP_TMR_EN);
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
-               /* ->set_next_event sets period and enables timer */
-               tmr &= ~(IOP_TMR_RELOAD | IOP_TMR_EN);
-               break;
-       case CLOCK_EVT_MODE_RESUME:
-               tmr |= IOP_TMR_EN;
-               break;
-       case CLOCK_EVT_MODE_SHUTDOWN:
-       case CLOCK_EVT_MODE_UNUSED:
-       default:
-               tmr &= ~IOP_TMR_EN;
-               break;
-       }
+       write_tmr0(tmr & ~IOP_TMR_EN);
+       write_tcr0(ticks_per_jiffy - 1);
+       write_trr0(ticks_per_jiffy - 1);
+       tmr |= (IOP_TMR_RELOAD | IOP_TMR_EN);
 
        write_tmr0(tmr);
+       return 0;
+}
+
+static int iop_set_oneshot(struct clock_event_device *evt)
+{
+       u32 tmr = read_tmr0();
+
+       /* ->set_next_event sets period and enables timer */
+       tmr &= ~(IOP_TMR_RELOAD | IOP_TMR_EN);
+       write_tmr0(tmr);
+       return 0;
+}
+
+static int iop_shutdown(struct clock_event_device *evt)
+{
+       u32 tmr = read_tmr0();
+
+       tmr &= ~IOP_TMR_EN;
+       write_tmr0(tmr);
+       return 0;
+}
+
+static int iop_resume(struct clock_event_device *evt)
+{
+       u32 tmr = read_tmr0();
+
+       tmr |= IOP_TMR_EN;
+       write_tmr0(tmr);
+       return 0;
 }
 
 static struct clock_event_device iop_clockevent = {
-       .name           = "iop_timer0",
-       .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-       .rating         = 300,
-       .set_next_event = iop_set_next_event,
-       .set_mode       = iop_set_mode,
+       .name                   = "iop_timer0",
+       .features               = CLOCK_EVT_FEAT_PERIODIC |
+                                 CLOCK_EVT_FEAT_ONESHOT,
+       .rating                 = 300,
+       .set_next_event         = iop_set_next_event,
+       .set_state_shutdown     = iop_shutdown,
+       .set_state_periodic     = iop_set_periodic,
+       .tick_resume            = iop_resume,
+       .set_state_oneshot      = iop_set_oneshot,
 };
 
 static irqreturn_t
@@ -127,7 +143,7 @@ iop_timer_interrupt(int irq, void *dev_id)
 static struct irqaction iop_timer_irq = {
        .name           = "IOP Timer Tick",
        .handler        = iop_timer_interrupt,
-       .flags          = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
+       .flags          = IRQF_TIMER | IRQF_IRQPOLL,
        .dev_id         = &iop_clockevent,
 };