diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-13 13:17:24 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 22:44:31 +0000 |
| commit | 08963dab7c6b0ba6a687cb008299eabbbeff7282 (patch) | |
| tree | 3bf88324a9ab5e6a4067b127e85da6fb198ab595 /arch/arm/mach-integrator/integrator_ap.c | |
| parent | 7c044be50d4bdc33e039a65956b8a927feecaaa3 (diff) | |
| download | linux-08963dab7c6b0ba6a687cb008299eabbbeff7282.tar.gz linux-08963dab7c6b0ba6a687cb008299eabbbeff7282.tar.bz2 linux-08963dab7c6b0ba6a687cb008299eabbbeff7282.zip | |
ARM: integrator: 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.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator/integrator_ap.c')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 548208f11179..2774df8021dc 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -372,7 +372,6 @@ static struct clocksource clocksource_timersp = { .rating = 200, .read = timersp_read, .mask = CLOCKSOURCE_MASK(16), - .shift = 16, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -390,8 +389,7 @@ static void integrator_clocksource_init(u32 khz) writel(ctrl, base + TIMER_CTRL); writel(0xffff, base + TIMER_LOAD); - cs->mult = clocksource_khz2mult(khz, cs->shift); - clocksource_register(cs); + clocksource_register_khz(cs, khz); } static void __iomem * const clkevt_base = (void __iomem *)TIMER1_VA_BASE; |