* [PATCH] clocksource: use the correct base address to setup timer 0
@ 2011-05-16 17:08 H Hartley Sweeten
2011-05-16 17:16 ` Russell King - ARM Linux
0 siblings, 1 reply; 4+ messages in thread
From: H Hartley Sweeten @ 2011-05-16 17:08 UTC (permalink / raw)
To: linux-arm-kernel
The static variable clksrc_base was removed by:
commit 3f3808c30612334e38e0641024d2c020c0eda7d4
Use the base address passed to sp804_clocksource_init() when
doing the setup for timer 0.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Russell King <linux@arm.linux.org.uk>
---
diff --git a/arch/arm/common/timer-sp.c b/arch/arm/common/timer-sp.c
index 27f7c22..445b05e 100644
--- a/arch/arm/common/timer-sp.c
+++ b/arch/arm/common/timer-sp.c
@@ -35,11 +35,11 @@
void __init sp804_clocksource_init(void __iomem *base)
{
/* setup timer 0 as free-running clocksource */
- writel(0, clksrc_base + TIMER_CTRL);
- writel(0xffffffff, clksrc_base + TIMER_LOAD);
- writel(0xffffffff, clksrc_base + TIMER_VALUE);
+ writel(0, base + TIMER_CTRL);
+ writel(0xffffffff, base + TIMER_LOAD);
+ writel(0xffffffff, base + TIMER_VALUE);
writel(TIMER_CTRL_32BIT | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC,
- clksrc_base + TIMER_CTRL);
+ base + TIMER_CTRL);
clocksource_mmio_init(base + TIMER_VALUE, "timer3",
TIMER_FREQ_KHZ * 1000, 200, 32, clocksource_mmio_readl_down);
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] clocksource: use the correct base address to setup timer 0
2011-05-16 17:08 [PATCH] clocksource: use the correct base address to setup timer 0 H Hartley Sweeten
@ 2011-05-16 17:16 ` Russell King - ARM Linux
2011-05-16 17:17 ` H Hartley Sweeten
0 siblings, 1 reply; 4+ messages in thread
From: Russell King - ARM Linux @ 2011-05-16 17:16 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 16, 2011 at 10:08:30AM -0700, H Hartley Sweeten wrote:
> The static variable clksrc_base was removed by:
>
> commit 3f3808c30612334e38e0641024d2c020c0eda7d4
>
> Use the base address passed to sp804_clocksource_init() when
> doing the setup for timer 0.
>
> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Russell King <linux@arm.linux.org.uk>
This has already been fixed.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] clocksource: use the correct base address to setup timer 0
2011-05-16 17:16 ` Russell King - ARM Linux
@ 2011-05-16 17:17 ` H Hartley Sweeten
2011-05-16 17:18 ` Russell King - ARM Linux
0 siblings, 1 reply; 4+ messages in thread
From: H Hartley Sweeten @ 2011-05-16 17:17 UTC (permalink / raw)
To: linux-arm-kernel
On Monday, May 16, 2011 10:16 AM, Russell King wrote:
> On Mon, May 16, 2011 at 10:08:30AM -0700, H Hartley Sweeten wrote:
>> The static variable clksrc_base was removed by:
>>
>> commit 3f3808c30612334e38e0641024d2c020c0eda7d4
>>
>> Use the base address passed to sp804_clocksource_init() when
>> doing the setup for timer 0.
>>
>> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
>> Cc: Russell King <linux@arm.linux.org.uk>
>
> This has already been fixed.
Ok. Thanks for the info.
Hartley
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] clocksource: use the correct base address to setup timer 0
2011-05-16 17:17 ` H Hartley Sweeten
@ 2011-05-16 17:18 ` Russell King - ARM Linux
0 siblings, 0 replies; 4+ messages in thread
From: Russell King - ARM Linux @ 2011-05-16 17:18 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 16, 2011 at 12:17:44PM -0500, H Hartley Sweeten wrote:
> On Monday, May 16, 2011 10:16 AM, Russell King wrote:
> > On Mon, May 16, 2011 at 10:08:30AM -0700, H Hartley Sweeten wrote:
> >> The static variable clksrc_base was removed by:
> >>
> >> commit 3f3808c30612334e38e0641024d2c020c0eda7d4
> >>
> >> Use the base address passed to sp804_clocksource_init() when
> >> doing the setup for timer 0.
> >>
> >> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
> >> Cc: Russell King <linux@arm.linux.org.uk>
> >
> > This has already been fixed.
>
> Ok. Thanks for the info.
I'm about to repost the entire series.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-05-16 17:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-16 17:08 [PATCH] clocksource: use the correct base address to setup timer 0 H Hartley Sweeten
2011-05-16 17:16 ` Russell King - ARM Linux
2011-05-16 17:17 ` H Hartley Sweeten
2011-05-16 17:18 ` Russell King - ARM Linux
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).