aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-12-13 08:21:52 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-12-22 17:44:41 -0500
commit11e718a6535c0c7a375b24c3ad60a98b988090c8 (patch)
tree1c9583226ae3f0ab5dd166c0e183673a6d3ab251
parent2218543fe0c40ce36fa165c5003072cc8b236c34 (diff)
ARM: realview/versatile: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Tested-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/plat-versatile/timer-sp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/plat-versatile/timer-sp.c b/arch/arm/plat-versatile/timer-sp.c
index fb0d1c299718..f09941b84381 100644
--- a/arch/arm/plat-versatile/timer-sp.c
+++ b/arch/arm/plat-versatile/timer-sp.c
@@ -46,7 +46,6 @@ static struct clocksource clocksource_sp804 = {
46 .rating = 200, 46 .rating = 200,
47 .read = sp804_read, 47 .read = sp804_read,
48 .mask = CLOCKSOURCE_MASK(32), 48 .mask = CLOCKSOURCE_MASK(32),
49 .shift = 20,
50 .flags = CLOCK_SOURCE_IS_CONTINUOUS, 49 .flags = CLOCK_SOURCE_IS_CONTINUOUS,
51}; 50};
52 51
@@ -63,8 +62,7 @@ void __init sp804_clocksource_init(void __iomem *base)
63 writel(TIMER_CTRL_32BIT | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC, 62 writel(TIMER_CTRL_32BIT | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC,
64 clksrc_base + TIMER_CTRL); 63 clksrc_base + TIMER_CTRL);
65 64
66 cs->mult = clocksource_khz2mult(TIMER_FREQ_KHZ, cs->shift); 65 clocksource_register_khz(cs, TIMER_FREQ_KHZ);
67 clocksource_register(cs);
68} 66}
69 67
70 68