ARM: ep93xx/timer: Migrate to new 'set-state' interface

[karo-tx-linux.git] / arch / arm / mach-ep93xx / timer-ep93xx.c

diff --git a/arch/arm/mach-ep93xx/timer-ep93xx.c b/arch/arm/mach-ep93xx/timer-ep93xx.c
index ac48ac1fd16de0cf3128b34d5dca2250d5f7a389..e5f791145bd00dc4cb9424101564ef60c0c2f6bb 100644 (file)
--- a/arch/arm/mach-ep93xx/timer-ep93xx.c
+++ b/arch/arm/mach-ep93xx/timer-ep93xx.c
@@ -86,19 +86,22 @@ static int ep93xx_clkevt_set_next_event(unsigned long next,
 }
 
 
-static void ep93xx_clkevt_set_mode(enum clock_event_mode mode,
-                                  struct clock_event_device *evt)
+static int ep93xx_clkevt_shutdown(struct clock_event_device *evt)
 {
        /* Disable timer */
        writel(0, EP93XX_TIMER3_CONTROL);
+
+       return 0;
 }
 
 static struct clock_event_device ep93xx_clockevent = {
-       .name           = "timer1",
-       .features       = CLOCK_EVT_FEAT_ONESHOT,
-       .set_mode       = ep93xx_clkevt_set_mode,
-       .set_next_event = ep93xx_clkevt_set_next_event,
-       .rating         = 300,
+       .name                   = "timer1",
+       .features               = CLOCK_EVT_FEAT_ONESHOT,
+       .set_state_shutdown     = ep93xx_clkevt_shutdown,
+       .set_state_oneshot      = ep93xx_clkevt_shutdown,
+       .tick_resume            = ep93xx_clkevt_shutdown,
+       .set_next_event         = ep93xx_clkevt_set_next_event,
+       .rating                 = 300,
 };
 
 static irqreturn_t ep93xx_timer_interrupt(int irq, void *dev_id)