diff options
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 548208f1117..2774df8021d 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 = { | |||
372 | .rating = 200, | 372 | .rating = 200, |
373 | .read = timersp_read, | 373 | .read = timersp_read, |
374 | .mask = CLOCKSOURCE_MASK(16), | 374 | .mask = CLOCKSOURCE_MASK(16), |
375 | .shift = 16, | ||
376 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 375 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
377 | }; | 376 | }; |
378 | 377 | ||
@@ -390,8 +389,7 @@ static void integrator_clocksource_init(u32 khz) | |||
390 | writel(ctrl, base + TIMER_CTRL); | 389 | writel(ctrl, base + TIMER_CTRL); |
391 | writel(0xffff, base + TIMER_LOAD); | 390 | writel(0xffff, base + TIMER_LOAD); |
392 | 391 | ||
393 | cs->mult = clocksource_khz2mult(khz, cs->shift); | 392 | clocksource_register_khz(cs, khz); |
394 | clocksource_register(cs); | ||
395 | } | 393 | } |
396 | 394 | ||
397 | static void __iomem * const clkevt_base = (void __iomem *)TIMER1_VA_BASE; | 395 | static void __iomem * const clkevt_base = (void __iomem *)TIMER1_VA_BASE; |