Commit 7c044be5 authored by Russell King's avatar Russell King

ARM: davinci: update clock source registration

In d7e81c26 (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: default avatarKevin Hilman <khilman@deeprootsystems.com>
Tested-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6eda5119
...@@ -276,7 +276,6 @@ static struct clocksource clocksource_davinci = { ...@@ -276,7 +276,6 @@ static struct clocksource clocksource_davinci = {
.rating = 300, .rating = 300,
.read = read_cycles, .read = read_cycles,
.mask = CLOCKSOURCE_MASK(32), .mask = CLOCKSOURCE_MASK(32),
.shift = 24,
.flags = CLOCK_SOURCE_IS_CONTINUOUS, .flags = CLOCK_SOURCE_IS_CONTINUOUS,
}; };
...@@ -378,10 +377,8 @@ static void __init davinci_timer_init(void) ...@@ -378,10 +377,8 @@ static void __init davinci_timer_init(void)
/* setup clocksource */ /* setup clocksource */
clocksource_davinci.name = id_to_name[clocksource_id]; clocksource_davinci.name = id_to_name[clocksource_id];
clocksource_davinci.mult = if (clocksource_register_hz(&clocksource_davinci,
clocksource_khz2mult(davinci_clock_tick_rate/1000, davinci_clock_tick_rate))
clocksource_davinci.shift);
if (clocksource_register(&clocksource_davinci))
printk(err, clocksource_davinci.name); printk(err, clocksource_davinci.name);
/* setup clockevent */ /* setup clockevent */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment