]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
clocksource: sun4i: rename AUTORELOAD define to RELOAD
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Tue, 16 Jul 2013 14:45:37 +0000 (16:45 +0200)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Thu, 18 Jul 2013 13:27:14 +0000 (15:27 +0200)
The name AUTORELOAD was actually pretty bad since it doesn't make the
register reload the previous interval when it expires, but setting this
value pushes the new programmed interval to the internal timer counter.
Rename it to RELOAD instead.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
drivers/clocksource/sun4i_timer.c

index 34ab6580ad1cb17f53ab906281a268e16470f8cf..f5e227b06ad56d9b5a0fcceaa5085d2f2a831f86 100644 (file)
@@ -28,7 +28,7 @@
 #define TIMER_IRQ_ST_REG       0x04
 #define TIMER_CTL_REG(val)     (0x10 * val + 0x10)
 #define TIMER_CTL_ENABLE               BIT(0)
-#define TIMER_CTL_AUTORELOAD           BIT(1)
+#define TIMER_CTL_RELOAD               BIT(1)
 #define TIMER_CTL_ONESHOT              BIT(7)
 #define TIMER_INTVAL_REG(val)  (0x10 * (val) + 0x14)
 #define TIMER_CNTVAL_REG(val)  (0x10 * (val) + 0x18)
@@ -129,7 +129,7 @@ static void __init sun4i_timer_init(struct device_node *node)
 
        /* set mode to auto reload */
        val = readl(timer_base + TIMER_CTL_REG(0));
-       writel(val | TIMER_CTL_AUTORELOAD, timer_base + TIMER_CTL_REG(0));
+       writel(val | TIMER_CTL_RELOAD, timer_base + TIMER_CTL_REG(0));
 
        ret = setup_irq(irq, &sun4i_timer_irq);
        if (ret)