diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-13 13:21:33 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 22:44:40 +0000 |
| commit | 1d0ac3cdf3d31ba84499c3a914aa2b54eecbf2af (patch) | |
| tree | 4cf5f0262a66bcc6306f62f26ca801847e6d4cc8 /arch | |
| parent | e0387320c32d4b9852e6436233274003e82318a6 (diff) | |
| download | op-kernel-dev-1d0ac3cdf3d31ba84499c3a914aa2b54eecbf2af.zip op-kernel-dev-1d0ac3cdf3d31ba84499c3a914aa2b54eecbf2af.tar.gz | |
ARM: orion: 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.
Acked-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-orion/time.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c index 715a301..11e2583 100644 --- a/arch/arm/plat-orion/time.c +++ b/arch/arm/plat-orion/time.c @@ -102,7 +102,6 @@ static cycle_t orion_clksrc_read(struct clocksource *cs) static struct clocksource orion_clksrc = { .name = "orion_clocksource", - .shift = 20, .rating = 300, .read = orion_clksrc_read, .mask = CLOCKSOURCE_MASK(32), @@ -245,8 +244,7 @@ void __init orion_time_init(unsigned int irq, unsigned int tclk) writel(u & ~BRIDGE_INT_TIMER0, BRIDGE_MASK); u = readl(TIMER_CTRL); writel(u | TIMER0_EN | TIMER0_RELOAD_EN, TIMER_CTRL); - orion_clksrc.mult = clocksource_hz2mult(tclk, orion_clksrc.shift); - clocksource_register(&orion_clksrc); + clocksource_register_hz(&orion_clksrc, tclk); /* * Setup clockevent timer (interrupt-driven.) |
