diff options
| author | John Stultz <johnstul@us.ibm.com> | 2010-04-26 20:21:52 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-11-21 19:01:01 -0800 |
| commit | 010f3f1692b22f8ddabdccc6526915e181e49447 (patch) | |
| tree | 05f7b55fcdedb4c3c2a2b7f8d22fbf295858c50e /arch/m68k/platform/coldfire/timers.c | |
| parent | 5f724e84f91550985a9ae3deb6e0dbc8d8396ed7 (diff) | |
| download | lwn-010f3f1692b22f8ddabdccc6526915e181e49447.tar.gz lwn-010f3f1692b22f8ddabdccc6526915e181e49447.zip | |
clocksource: m86k: Convert to clocksource_register_hz/khz
This converts the m86k clocksources to use clocksource_register_hz/khz
CC: Geert Uytterhoeven <geert@linux-m68k.org>
CC: Greg Ungerer <gerg@uclinux.org>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Diffstat (limited to 'arch/m68k/platform/coldfire/timers.c')
| -rw-r--r-- | arch/m68k/platform/coldfire/timers.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/m68k/platform/coldfire/timers.c b/arch/m68k/platform/coldfire/timers.c index 60242f65fea9..0d90da32fcdb 100644 --- a/arch/m68k/platform/coldfire/timers.c +++ b/arch/m68k/platform/coldfire/timers.c @@ -88,7 +88,6 @@ static struct clocksource mcftmr_clk = { .name = "tmr", .rating = 250, .read = mcftmr_read_clk, - .shift = 20, .mask = CLOCKSOURCE_MASK(32), .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -109,8 +108,7 @@ void hw_timer_init(void) __raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 | MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR)); - mcftmr_clk.mult = clocksource_hz2mult(FREQ, mcftmr_clk.shift); - clocksource_register(&mcftmr_clk); + clocksource_register_hz(&mcftmr_clk, FREQ); setup_irq(MCF_IRQ_TIMER, &mcftmr_timer_irq); |