diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-13 08:19:55 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 17:44:37 -0500 |
commit | da797478c1ba05a858c7719a02ce0856a5bb69ce (patch) | |
tree | 051d00ae199e5ec117dc243d9c1dcafed39a0487 /arch/arm/mach-u300 | |
parent | 6b46340a18e7552656097119d121b4b42049dde1 (diff) |
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')
-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 3fc4472719be..377ff7ff9182 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) | |||
412 | writel(U300_TIMER_APP_EGPT2_TIMER_ENABLE, | 412 | writel(U300_TIMER_APP_EGPT2_TIMER_ENABLE, |
413 | U300_TIMER_APP_VBASE + U300_TIMER_APP_EGPT2); | 413 | U300_TIMER_APP_VBASE + U300_TIMER_APP_EGPT2); |
414 | 414 | ||
415 | clocksource_calc_mult_shift(&clocksource_u300_1mhz, | 415 | if (clocksource_register_hz(&clocksource_u300_1mhz, rate)) |
416 | rate, APPTIMER_MIN_RANGE); | ||
417 | if (clocksource_register(&clocksource_u300_1mhz)) | ||
418 | printk(KERN_ERR "timer: failed to initialize clock " | 416 | printk(KERN_ERR "timer: failed to initialize clock " |
419 | "source %s\n", clocksource_u300_1mhz.name); | 417 | "source %s\n", clocksource_u300_1mhz.name); |
420 | 418 | ||