[PATCH 2/8] clocksource: sun4i: Add clocksource and sched clock drivers
From: baruch@tkos.co.il (Baruch Siach)
Date: 2013-06-27 06:02:46
Also in:
lkml
Hi Maxime, On Wed, Jun 26, 2013 at 11:16:55PM +0200, Maxime Ripard wrote:
quoted hunk ↗ jump to hunk
The A10 and the A13 has a 64 bits free running counter that we can use as a clocksource and a sched clock, that were both not used yet on these platforms. Signed-off-by: Maxime Ripard <redacted> --- drivers/clocksource/sun4i_timer.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c index bdf34d9..1d2eaa0 100644 --- a/drivers/clocksource/sun4i_timer.c +++ b/drivers/clocksource/sun4i_timer.c@@ -23,6 +23,8 @@ #include <linux/of_address.h> #include <linux/of_irq.h> +#include <asm/sched_clock.h>
In the tip.git tree (and -next) this header is moved to <linux/sched_clock.h> in 38ff87f77a (sched_clock: Make ARM's sched_clock generic for all architectures).
quoted hunk ↗ jump to hunk
+ #define TIMER_IRQ_EN_REG 0x00 #define TIMER_IRQ_EN(val) BIT(val) #define TIMER_IRQ_ST_REG 0x04@@ -34,6 +36,11 @@ #define TIMER_CNTVAL_REG(val) (0x10 * val + 0x18) #define TIMER_SCAL 16 +#define TIMER_CNT64_CTL_REG 0xa0 +#define TIMER_CNT64_CTL_CLR BIT(0) +#define TIMER_CNT64_CTL_RL BIT(1) +#define TIMER_CNT64_LOW_REG 0xa4 +#define TIMER_CNT64_HIGH_REG 0xa8 static void __iomem *timer_base;@@ -96,6 +103,20 @@ static struct irqaction sun4i_timer_irq = { .dev_id = &sun4i_clockevent, }; +static u32 sun4i_timer_sched_read(void)
You commit message mentions "64 bits free running counter", but this one only returns 32 bit. baruch
quoted hunk ↗ jump to hunk
+{ + u32 reg = readl(timer_base + TIMER_CNT64_CTL_REG); + writel(reg | TIMER_CNT64_CTL_RL, timer_base + TIMER_CNT64_CTL_REG); + while (readl(timer_base + TIMER_CNT64_CTL_REG) & TIMER_CNT64_CTL_REG); + + return readl(timer_base + TIMER_CNT64_LOW_REG); +} + +static cycle_t sun4i_timer_clksrc_read(struct clocksource *c) +{ + return sun4i_timer_sched_read(); +} + static void __init sun4i_timer_init(struct device_node *node) { unsigned long rate = 0;@@ -117,6 +138,12 @@ static void __init sun4i_timer_init(struct device_node *node) rate = clk_get_rate(clk); + writel(TIMER_CNT64_CTL_CLR, timer_base + TIMER_CNT64_CTL_REG); + setup_sched_clock(sun4i_timer_sched_read, 32, clk_get_rate(clk)); + clocksource_mmio_init(timer_base + TIMER_CNT64_LOW_REG, node->name, + clk_get_rate(clk), 300, 32, + sun4i_timer_clksrc_read); + writel(rate / (TIMER_SCAL * HZ), timer_base + TIMER_INTVAL_REG(0));
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -