diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-13 08:17:12 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 17:44:30 -0500 |
commit | 7c044be50d4bdc33e039a65956b8a927feecaaa3 (patch) | |
tree | 361effa68c9d808b8a3c1c7b21f26f6b60463e6b | |
parent | 6eda51192fb1c767f792e92c67b9a4fd73c1fcba (diff) |
ARM: davinci: 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: Kevin Hilman <khilman@deeprootsystems.com>
Tested-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-davinci/time.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c index 0f21c36e65d..c1486716de7 100644 --- a/arch/arm/mach-davinci/time.c +++ b/arch/arm/mach-davinci/time.c | |||
@@ -276,7 +276,6 @@ static struct clocksource clocksource_davinci = { | |||
276 | .rating = 300, | 276 | .rating = 300, |
277 | .read = read_cycles, | 277 | .read = read_cycles, |
278 | .mask = CLOCKSOURCE_MASK(32), | 278 | .mask = CLOCKSOURCE_MASK(32), |
279 | .shift = 24, | ||
280 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 279 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
281 | }; | 280 | }; |
282 | 281 | ||
@@ -378,10 +377,8 @@ static void __init davinci_timer_init(void) | |||
378 | 377 | ||
379 | /* setup clocksource */ | 378 | /* setup clocksource */ |
380 | clocksource_davinci.name = id_to_name[clocksource_id]; | 379 | clocksource_davinci.name = id_to_name[clocksource_id]; |
381 | clocksource_davinci.mult = | 380 | if (clocksource_register_hz(&clocksource_davinci, |
382 | clocksource_khz2mult(davinci_clock_tick_rate/1000, | 381 | davinci_clock_tick_rate)) |
383 | clocksource_davinci.shift); | ||
384 | if (clocksource_register(&clocksource_davinci)) | ||
385 | printk(err, clocksource_davinci.name); | 382 | printk(err, clocksource_davinci.name); |
386 | 383 | ||
387 | /* setup clockevent */ | 384 | /* setup clockevent */ |