summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2013-07-16 16:45:37 +0200
committerDaniel Lezcano <daniel.lezcano@linaro.org>2013-07-18 15:27:14 +0200
commit9eded23215e99338155c18f6d860859106568bb0 (patch)
tree2dbd91126baf3b0f634f4c07f8e44c81c8f739b1 /drivers/clocksource
parentbb008b9e873f5544120dcd401316b4c0e7743dde (diff)
downloadlinux-9eded23215e99338155c18f6d860859106568bb0.tar.bz2
clocksource: sun4i: rename AUTORELOAD define to RELOAD
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>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/sun4i_timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c
index 34ab6580ad1c..f5e227b06ad5 100644
--- a/drivers/clocksource/sun4i_timer.c
+++ b/drivers/clocksource/sun4i_timer.c
@@ -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)