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

[kvmfornfv.git] / kernel / drivers / clocksource / vt8500_timer.c

diff --git a/kernel/drivers/clocksource/vt8500_timer.c b/kernel/drivers/clocksource/vt8500_timer.c
index 1098ed3..dfc3bb4 100644 (file)
--- a/kernel/drivers/clocksource/vt8500_timer.c
+++ b/kernel/drivers/clocksource/vt8500_timer.c
@@ -50,6 +50,8 @@
 
 #define msecs_to_loops(t) (loops_per_jiffy / 1000 * HZ * t)
 
+#define MIN_OSCR_DELTA         16
+
 static void __iomem *regbase;
 
 static cycle_t vt8500_timer_read(struct clocksource *cs)
@@ -80,7 +82,7 @@ static int vt8500_timer_set_next_event(unsigned long cycles,
                cpu_relax();
        writel((unsigned long)alarm, regbase + TIMER_MATCH_VAL);
 
-       if ((signed)(alarm - clocksource.read(&clocksource)) <= 16)
+       if ((signed)(alarm - clocksource.read(&clocksource)) <= MIN_OSCR_DELTA)
                return -ETIME;
 
        writel(1, regbase + TIMER_IER_VAL);
@@ -88,29 +90,20 @@ static int vt8500_timer_set_next_event(unsigned long cycles,
        return 0;
 }
 
-static void vt8500_timer_set_mode(enum clock_event_mode mode,
-                             struct clock_event_device *evt)
+static int vt8500_shutdown(struct clock_event_device *evt)
 {
-       switch (mode) {
-       case CLOCK_EVT_MODE_RESUME:
-       case CLOCK_EVT_MODE_PERIODIC:
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
-       case CLOCK_EVT_MODE_UNUSED:
-       case CLOCK_EVT_MODE_SHUTDOWN:
-               writel(readl(regbase + TIMER_CTRL_VAL) | 1,
-                       regbase + TIMER_CTRL_VAL);
-               writel(0, regbase + TIMER_IER_VAL);
-               break;
-       }
+       writel(readl(regbase + TIMER_CTRL_VAL) | 1, regbase + TIMER_CTRL_VAL);
+       writel(0, regbase + TIMER_IER_VAL);
+       return 0;
 }
 
 static struct clock_event_device clockevent = {
-       .name           = "vt8500_timer",
-       .features       = CLOCK_EVT_FEAT_ONESHOT,
-       .rating         = 200,
-       .set_next_event = vt8500_timer_set_next_event,
-       .set_mode       = vt8500_timer_set_mode,
+       .name                   = "vt8500_timer",
+       .features               = CLOCK_EVT_FEAT_ONESHOT,
+       .rating                 = 200,
+       .set_next_event         = vt8500_timer_set_next_event,
+       .set_state_shutdown     = vt8500_shutdown,
+       .set_state_oneshot      = vt8500_shutdown,
 };
 
 static irqreturn_t vt8500_timer_interrupt(int irq, void *dev_id)
@@ -160,7 +153,7 @@ static void __init vt8500_timer_init(struct device_node *np)
                pr_err("%s: setup_irq failed for %s\n", __func__,
                                                        clockevent.name);
        clockevents_config_and_register(&clockevent, VT8500_TIMER_HZ,
-                                       4, 0xf0000000);
+                                       MIN_OSCR_DELTA * 2, 0xf0000000);
 }
 
 CLOCKSOURCE_OF_DECLARE(vt8500, "via,vt8500-timer", vt8500_timer_init);