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>

diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c
index 715a30177f2857c02ed227e74240359be58dbb1a..11e2583e85e41bf3af57a903ca0436069a0454e0 100644 (file)
--- 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.)