diff options
| author | john stultz <johnstul@us.ibm.com> | 2011-10-25 11:46:10 -0700 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-12-24 21:47:56 +1000 |
| commit | a2a3dfb8efc5d14cf39358ae0ec1da39667c2e6c (patch) | |
| tree | 548ecc8c617eba4ed8b1b61de8d906d3b5b35096 /arch/m68k/platform/coldfire/sltimers.c | |
| parent | 5f0a6e2d503896062f641639dacfe5055c2f593b (diff) | |
| download | talos-op-linux-a2a3dfb8efc5d14cf39358ae0ec1da39667c2e6c.tar.gz talos-op-linux-a2a3dfb8efc5d14cf39358ae0ec1da39667c2e6c.zip | |
clocksource: m86k: Convert to clocksource_register_hz/khz
Updated to merge the valid bits of the two m68k patches.
This converts the m86k clocksources to use clocksource_register_hz/khz
This is untested, so any assistance in testing would be appreciated!
CC: Geert Uytterhoeven <geert@linux-m68k.org>
CC: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/platform/coldfire/sltimers.c')
| -rw-r--r-- | arch/m68k/platform/coldfire/sltimers.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/m68k/platform/coldfire/sltimers.c b/arch/m68k/platform/coldfire/sltimers.c index 6a85daf9a7fd..b7f822b552bb 100644 --- a/arch/m68k/platform/coldfire/sltimers.c +++ b/arch/m68k/platform/coldfire/sltimers.c @@ -114,7 +114,6 @@ static struct clocksource mcfslt_clk = { .name = "slt", .rating = 250, .read = mcfslt_read_clk, - .shift = 20, .mask = CLOCKSOURCE_MASK(32), .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -136,8 +135,7 @@ void hw_timer_init(void) setup_irq(MCF_IRQ_TIMER, &mcfslt_timer_irq); - mcfslt_clk.mult = clocksource_hz2mult(MCF_BUSCLK, mcfslt_clk.shift); - clocksource_register(&mcfslt_clk); + clocksource_register_hz(&mcfslt_clk, MCF_BUSCLK); #ifdef CONFIG_HIGHPROFILE mcfslt_profile_init(); |
