diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-13 13:19:55 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 22:44:37 +0000 |
| commit | da797478c1ba05a858c7719a02ce0856a5bb69ce (patch) | |
| tree | 051d00ae199e5ec117dc243d9c1dcafed39a0487 /arch/arm/mach-u300/timer.c | |
| parent | 6b46340a18e7552656097119d121b4b42049dde1 (diff) | |
| download | op-kernel-dev-da797478c1ba05a858c7719a02ce0856a5bb69ce.zip op-kernel-dev-da797478c1ba05a858c7719a02ce0856a5bb69ce.tar.gz | |
ARM: U300: 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: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-u300/timer.c')
| -rw-r--r-- | arch/arm/mach-u300/timer.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c index 3fc4472..377ff7f 100644 --- a/arch/arm/mach-u300/timer.c +++ b/arch/arm/mach-u300/timer.c @@ -412,9 +412,7 @@ static void __init u300_timer_init(void) writel(U300_TIMER_APP_EGPT2_TIMER_ENABLE, U300_TIMER_APP_VBASE + U300_TIMER_APP_EGPT2); - clocksource_calc_mult_shift(&clocksource_u300_1mhz, - rate, APPTIMER_MIN_RANGE); - if (clocksource_register(&clocksource_u300_1mhz)) + if (clocksource_register_hz(&clocksource_u300_1mhz, rate)) printk(KERN_ERR "timer: failed to initialize clock " "source %s\n", clocksource_u300_1mhz.name); |
