summaryrefslogtreecommitdiffstats
path: root/arch/m68k/platform/68328/timers.c
diff options
context:
space:
mode:
authorJohn Stultz2010-04-27 05:21:52 +0200
committerJohn Stultz2011-11-22 04:01:01 +0100
commit010f3f1692b22f8ddabdccc6526915e181e49447 (patch)
tree05f7b55fcdedb4c3c2a2b7f8d22fbf295858c50e /arch/m68k/platform/68328/timers.c
parenttime: x86: Replace LATCH with PIT_LATCH in i8253 clocksource driver (diff)
downloadkernel-qcow2-linux-010f3f1692b22f8ddabdccc6526915e181e49447.tar.gz
kernel-qcow2-linux-010f3f1692b22f8ddabdccc6526915e181e49447.tar.xz
kernel-qcow2-linux-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/68328/timers.c')
-rw-r--r--arch/m68k/platform/68328/timers.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/m68k/platform/68328/timers.c b/arch/m68k/platform/68328/timers.c
index 309f725995bf..f2678866067b 100644
--- a/arch/m68k/platform/68328/timers.c
+++ b/arch/m68k/platform/68328/timers.c
@@ -93,7 +93,6 @@ static struct clocksource m68328_clk = {
.name = "timer",
.rating = 250,
.read = m68328_read_clk,
- .shift = 20,
.mask = CLOCKSOURCE_MASK(32),
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
@@ -115,8 +114,7 @@ void hw_timer_init(void)
/* Enable timer 1 */
TCTL |= TCTL_TEN;
- m68328_clk.mult = clocksource_hz2mult(TICKS_PER_JIFFY*HZ, m68328_clk.shift);
- clocksource_register(&m68328_clk);
+ clocksource_register_hz(&m68328_clk, TICKS_PER_JIFFY*HZ);
}
/***************************************************************************/