From: maxime.ripard@free-electrons.com (Maxime Ripard)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv3 03/10] clocksource: sun4i: rename AUTORELOAD define to RELOAD
Date: Fri, 5 Jul 2013 21:34:30 +0200 [thread overview]
Message-ID: <1373052877-29366-4-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1373052877-29366-1-git-send-email-maxime.ripard@free-electrons.com>
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>
---
drivers/clocksource/sun4i_timer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c
index 34ab658..f5e227b 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)
--
1.8.3.2
next prev parent reply other threads:[~2013-07-05 19:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-05 19:34 [PATCHv3 00/10] clocksource: sunxi: Timer fixes and cleanup Maxime Ripard
2013-07-05 19:34 ` [PATCHv3 01/10] clocksource: sun4i: Use the BIT macros where possible Maxime Ripard
2013-07-05 19:34 ` [PATCHv3 02/10] clocksource: sun4i: Wrap macros arguments in parenthesis Maxime Ripard
2013-07-05 19:34 ` Maxime Ripard [this message]
2013-07-05 19:34 ` [PATCHv3 04/10] clocksource: sun4i: Add clocksource and sched clock drivers Maxime Ripard
2013-07-05 19:34 ` [PATCHv3 05/10] clocksource: sun4i: Don't forget to enable the clock we use Maxime Ripard
2013-07-05 19:34 ` [PATCHv3 06/10] clocksource: sun4i: Fix the next event code Maxime Ripard
2013-07-05 19:34 ` [PATCHv3 07/10] clocksource: sun4i: Factor out some timer code Maxime Ripard
2013-07-05 19:34 ` [PATCHv3 08/10] clocksource: sun4i: Remove TIMER_SCAL variable Maxime Ripard
2013-07-05 20:48 ` Thomas Gleixner
2013-07-05 22:12 ` Maxime Ripard
2013-07-05 19:34 ` [PATCHv3 09/10] clocksource: sun4i: Cleanup parent clock setup Maxime Ripard
2013-07-05 19:34 ` [PATCHv3 10/10] clocksource: sun4i: Fix bug when switching from periodic to oneshot modes Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1373052877-29366-4-git-send-email-maxime.ripard@free-electrons.com \
--to=maxime.ripard@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox