aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze/kernel/timer.c
diff options
context:
space:
mode:
authorJohn Stultz <johnstul@us.ibm.com>2010-04-26 23:22:23 -0400
committerJohn Stultz <john.stultz@linaro.org>2011-02-21 16:33:46 -0500
commitb8f39f7dfe12d4c8402c493a24fbf1e21d086771 (patch)
tree1c2ebc851cb544255c5d2cc658802361d0e5f7e4 /arch/microblaze/kernel/timer.c
parentd60c3041778c11f564969fb62b337df68232ee80 (diff)
microblaze: convert to clocksource_register_hz/khz
This converts the microblaze clocksources to use clocksource_register_hz/khz CC: Michal Simek <monstr@monstr.eu> CC: Thomas Gleixner <tglx@linutronix.de> Tested-by: Michal Simek <monstr@monstr.eu> Signed-off-by: John Stultz <johnstul@us.ibm.com>
Diffstat (limited to 'arch/microblaze/kernel/timer.c')
-rw-r--r--arch/microblaze/kernel/timer.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index a5aa33db1df3..68ec7d1e8439 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -217,16 +217,12 @@ static struct clocksource clocksource_microblaze = {
217 .rating = 300, 217 .rating = 300,
218 .read = microblaze_read, 218 .read = microblaze_read,
219 .mask = CLOCKSOURCE_MASK(32), 219 .mask = CLOCKSOURCE_MASK(32),
220 .shift = 8, /* I can shift it */
221 .flags = CLOCK_SOURCE_IS_CONTINUOUS, 220 .flags = CLOCK_SOURCE_IS_CONTINUOUS,
222}; 221};
223 222
224static int __init microblaze_clocksource_init(void) 223static int __init microblaze_clocksource_init(void)
225{ 224{
226 clocksource_microblaze.mult = 225 if (clocksource_register_hz(&clocksource_microblaze, timer_clock_freq))
227 clocksource_hz2mult(timer_clock_freq,
228 clocksource_microblaze.shift);
229 if (clocksource_register(&clocksource_microblaze))
230 panic("failed to register clocksource"); 226 panic("failed to register clocksource");
231 227
232 /* stop timer1 */ 228 /* stop timer1 */