diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-13 13:21:52 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 22:44:41 +0000 |
| commit | 11e718a6535c0c7a375b24c3ad60a98b988090c8 (patch) | |
| tree | 1c9583226ae3f0ab5dd166c0e183673a6d3ab251 /arch/arm/plat-versatile | |
| parent | 2218543fe0c40ce36fa165c5003072cc8b236c34 (diff) | |
| download | linux-11e718a6535c0c7a375b24c3ad60a98b988090c8.tar.gz linux-11e718a6535c0c7a375b24c3ad60a98b988090c8.tar.bz2 linux-11e718a6535c0c7a375b24c3ad60a98b988090c8.zip | |
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>
Diffstat (limited to 'arch/arm/plat-versatile')
| -rw-r--r-- | arch/arm/plat-versatile/timer-sp.c | 4 |
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 = { .rating = 200, .read = sp804_read, .mask = CLOCKSOURCE_MASK(32), - .shift = 20, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -63,8 +62,7 @@ void __init sp804_clocksource_init(void __iomem *base) writel(TIMER_CTRL_32BIT | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC, clksrc_base + TIMER_CTRL); - cs->mult = clocksource_khz2mult(TIMER_FREQ_KHZ, cs->shift); - clocksource_register(cs); + clocksource_register_khz(cs, TIMER_FREQ_KHZ); } |