From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: John Stultz <john.stultz@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Emilio Lopez <emilio@elopez.com.ar>,
kevin.z.m.zh@gmail.com, sunny@allwinnertech.com,
shuge@allwinnertech.com, linux-sunxi@googlegroups.com,
Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: [PATCHv4 08/10] clocksource: sun4i: Remove TIMER_SCAL variable
Date: Sat, 6 Jul 2013 00:18:43 +0200 [thread overview]
Message-ID: <1373062725-19625-9-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1373062725-19625-1-git-send-email-maxime.ripard@free-electrons.com>
The prescaler is only used when using the internal low frequency
oscillator (at 32kHz). Since we're using the higher frequency oscillator
at 24MHz, we can just remove it.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/clocksource/sun4i_timer.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c
index dd78b63..3217adc 100644
--- a/drivers/clocksource/sun4i_timer.c
+++ b/drivers/clocksource/sun4i_timer.c
@@ -34,8 +34,6 @@
#define TIMER_INTVAL_REG(val) (0x10 * (val) + 0x14)
#define TIMER_CNTVAL_REG(val) (0x10 * (val) + 0x18)
-#define TIMER_SCAL 16
-
static void __iomem *timer_base;
/*
@@ -168,8 +166,7 @@ static void __init sun4i_timer_init(struct device_node *node)
clocksource_mmio_init(timer_base + TIMER_CNTVAL_REG(1), node->name,
rate, 300, 32, clocksource_mmio_readl_down);
- writel(rate / (TIMER_SCAL * HZ),
- timer_base + TIMER_INTVAL_REG(0));
+ writel(rate / HZ, timer_base + TIMER_INTVAL_REG(0));
/* set clock source to HOSC, 16 pre-division */
val = readl(timer_base + TIMER_CTL_REG(0));
@@ -192,8 +189,8 @@ static void __init sun4i_timer_init(struct device_node *node)
sun4i_clockevent.cpumask = cpumask_of(0);
- clockevents_config_and_register(&sun4i_clockevent, rate / TIMER_SCAL,
- 0x1, 0xff);
+ clockevents_config_and_register(&sun4i_clockevent, rate, 0x1,
+ 0xffffffff);
}
CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-timer",
sun4i_timer_init);
--
1.8.3.2
next prev parent reply other threads:[~2013-07-05 22:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-05 22:18 [PATCHv4 00/10] clocksource: sunxi: Timer fixes and cleanup Maxime Ripard
2013-07-05 22:18 ` [PATCHv4 01/10] clocksource: sun4i: Use the BIT macros where possible Maxime Ripard
2013-07-05 22:18 ` [PATCHv4 02/10] clocksource: sun4i: Wrap macros arguments in parenthesis Maxime Ripard
2013-07-05 22:18 ` [PATCHv4 03/10] clocksource: sun4i: rename AUTORELOAD define to RELOAD Maxime Ripard
2013-07-05 22:18 ` [PATCHv4 04/10] clocksource: sun4i: Add clocksource and sched clock drivers Maxime Ripard
2013-07-05 22:18 ` [PATCHv4 05/10] clocksource: sun4i: Don't forget to enable the clock we use Maxime Ripard
2013-07-05 22:18 ` [PATCHv4 06/10] clocksource: sun4i: Fix the next event code Maxime Ripard
2013-07-05 22:18 ` [PATCHv4 07/10] clocksource: sun4i: Factor out some timer code Maxime Ripard
2013-07-05 22:18 ` Maxime Ripard [this message]
2013-07-05 23:17 ` [PATCHv4 08/10] clocksource: sun4i: Remove TIMER_SCAL variable Thomas Gleixner
2013-07-06 8:10 ` Maxime Ripard
2013-07-06 9:16 ` [linux-sunxi] " Oliver Schinagl
2013-07-06 10:56 ` Arnd Bergmann
2013-07-06 21:07 ` Thomas Gleixner
2013-07-05 22:18 ` [PATCHv4 09/10] clocksource: sun4i: Cleanup parent clock setup Maxime Ripard
2013-07-05 22:18 ` [PATCHv4 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=1373062725-19625-9-git-send-email-maxime.ripard@free-electrons.com \
--to=maxime.ripard@free-electrons.com \
--cc=emilio@elopez.com.ar \
--cc=john.stultz@linaro.org \
--cc=kevin.z.m.zh@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=shuge@allwinnertech.com \
--cc=sunny@allwinnertech.com \
--cc=tglx@linutronix.de \
/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
all inboxes | Powered by JetHome®