From: Russell King Date: Mon, 13 Dec 2010 13:21:33 +0000 (+0000) Subject: ARM: orion: update clock source registration X-Git-Tag: v2.6.38-rc1~471^2~3^2~18 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d0ac3cdf3d31ba84499c3a914aa2b54eecbf2af;p=profile%2Fivi%2Fkernel-x86-ivi.git 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 Signed-off-by: Russell King --- 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.)