diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-13 08:19:22 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 17:44:36 -0500 |
commit | 71c874529904818a2888a650425369e0842ff28d (patch) | |
tree | 9a52a2d3f6fc5bdad57a941efda5b348b170e86b /arch/arm/mach-s5pv310/time.c | |
parent | f62ae0ce4369effc432ea25df09c88d7aa08965e (diff) |
ARM: s5pv310: 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: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s5pv310/time.c')
-rw-r--r-- | arch/arm/mach-s5pv310/time.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-s5pv310/time.c b/arch/arm/mach-s5pv310/time.c index 01b012ad1bfd..b262d4615331 100644 --- a/arch/arm/mach-s5pv310/time.c +++ b/arch/arm/mach-s5pv310/time.c | |||
@@ -211,7 +211,6 @@ struct clocksource pwm_clocksource = { | |||
211 | .rating = 250, | 211 | .rating = 250, |
212 | .read = s5pv310_pwm4_read, | 212 | .read = s5pv310_pwm4_read, |
213 | .mask = CLOCKSOURCE_MASK(32), | 213 | .mask = CLOCKSOURCE_MASK(32), |
214 | .shift = 20, | ||
215 | .flags = CLOCK_SOURCE_IS_CONTINUOUS , | 214 | .flags = CLOCK_SOURCE_IS_CONTINUOUS , |
216 | }; | 215 | }; |
217 | 216 | ||
@@ -230,10 +229,7 @@ static void __init s5pv310_clocksource_init(void) | |||
230 | s5pv310_pwm_init(4, ~0); | 229 | s5pv310_pwm_init(4, ~0); |
231 | s5pv310_pwm_start(4, 1); | 230 | s5pv310_pwm_start(4, 1); |
232 | 231 | ||
233 | pwm_clocksource.mult = | 232 | if (clocksource_register_hz(&pwm_clocksource, clock_rate)) |
234 | clocksource_khz2mult(clock_rate/1000, pwm_clocksource.shift); | ||
235 | |||
236 | if (clocksource_register(&pwm_clocksource)) | ||
237 | panic("%s: can't register clocksource\n", pwm_clocksource.name); | 233 | panic("%s: can't register clocksource\n", pwm_clocksource.name); |
238 | } | 234 | } |
239 | 235 | ||