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

[kvmfornfv.git] / kernel / drivers / clocksource / timer-sun5i.c

diff --git a/kernel/drivers/clocksource/timer-sun5i.c b/kernel/drivers/clocksource/timer-sun5i.c
index 28aa4b7..bca9573 100644 (file)
--- a/kernel/drivers/clocksource/timer-sun5i.c
+++ b/kernel/drivers/clocksource/timer-sun5i.c
@@ -103,27 +103,31 @@ static void sun5i_clkevt_time_start(struct sun5i_timer_clkevt *ce, u8 timer, boo
               ce->timer.base + TIMER_CTL_REG(timer));
 }
 
-static void sun5i_clkevt_mode(enum clock_event_mode mode,
-                             struct clock_event_device *clkevt)
+static int sun5i_clkevt_shutdown(struct clock_event_device *clkevt)
 {
        struct sun5i_timer_clkevt *ce = to_sun5i_timer_clkevt(clkevt);
 
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               sun5i_clkevt_time_stop(ce, 0);
-               sun5i_clkevt_time_setup(ce, 0, ce->timer.ticks_per_jiffy);
-               sun5i_clkevt_time_start(ce, 0, true);
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
-               sun5i_clkevt_time_stop(ce, 0);
-               sun5i_clkevt_time_start(ce, 0, false);
-               break;
-       case CLOCK_EVT_MODE_UNUSED:
-       case CLOCK_EVT_MODE_SHUTDOWN:
-       default:
-               sun5i_clkevt_time_stop(ce, 0);
-               break;
-       }
+       sun5i_clkevt_time_stop(ce, 0);
+       return 0;
+}
+
+static int sun5i_clkevt_set_oneshot(struct clock_event_device *clkevt)
+{
+       struct sun5i_timer_clkevt *ce = to_sun5i_timer_clkevt(clkevt);
+
+       sun5i_clkevt_time_stop(ce, 0);
+       sun5i_clkevt_time_start(ce, 0, false);
+       return 0;
+}
+
+static int sun5i_clkevt_set_periodic(struct clock_event_device *clkevt)
+{
+       struct sun5i_timer_clkevt *ce = to_sun5i_timer_clkevt(clkevt);
+
+       sun5i_clkevt_time_stop(ce, 0);
+       sun5i_clkevt_time_setup(ce, 0, ce->timer.ticks_per_jiffy);
+       sun5i_clkevt_time_start(ce, 0, true);
+       return 0;
 }
 
 static int sun5i_clkevt_next_event(unsigned long evt,
@@ -286,7 +290,10 @@ static int __init sun5i_setup_clockevent(struct device_node *node, void __iomem
        ce->clkevt.name = node->name;
        ce->clkevt.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
        ce->clkevt.set_next_event = sun5i_clkevt_next_event;
-       ce->clkevt.set_mode = sun5i_clkevt_mode;
+       ce->clkevt.set_state_shutdown = sun5i_clkevt_shutdown;
+       ce->clkevt.set_state_periodic = sun5i_clkevt_set_periodic;
+       ce->clkevt.set_state_oneshot = sun5i_clkevt_set_oneshot;
+       ce->clkevt.tick_resume = sun5i_clkevt_shutdown;
        ce->clkevt.rating = 340;
        ce->clkevt.irq = irq;
        ce->clkevt.cpumask = cpu_possible_mask;
@@ -324,7 +331,7 @@ static void __init sun5i_timer_init(struct device_node *node)
        int irq;
 
        timer_base = of_io_request_and_map(node, 0, of_node_full_name(node));
-       if (!timer_base)
+       if (IS_ERR(timer_base))
                panic("Can't map registers");
 
        irq = irq_of_parse_and_map(node, 0);