aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stultz <johnstul@us.ibm.com>2010-04-26 20:22:23 -0700
committerJohn Stultz <john.stultz@linaro.org>2011-02-21 13:33:46 -0800
commitb8f39f7dfe12d4c8402c493a24fbf1e21d086771 (patch)
tree1c2ebc851cb544255c5d2cc658802361d0e5f7e4
parentd60c3041778c11f564969fb62b337df68232ee80 (diff)
downloadkernel_samsung_smdk4412-b8f39f7dfe12d4c8402c493a24fbf1e21d086771.zip
kernel_samsung_smdk4412-b8f39f7dfe12d4c8402c493a24fbf1e21d086771.tar.gz
kernel_samsung_smdk4412-b8f39f7dfe12d4c8402c493a24fbf1e21d086771.tar.bz2
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>
-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 a5aa33d..68ec7d1 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -217,16 +217,12 @@ static struct clocksource clocksource_microblaze = {
.rating = 300,
.read = microblaze_read,
.mask = CLOCKSOURCE_MASK(32),
- .shift = 8, /* I can shift it */
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
static int __init microblaze_clocksource_init(void)
{
- clocksource_microblaze.mult =
- clocksource_hz2mult(timer_clock_freq,
- clocksource_microblaze.shift);
- if (clocksource_register(&clocksource_microblaze))
+ if (clocksource_register_hz(&clocksource_microblaze, timer_clock_freq))
panic("failed to register clocksource");
/* stop timer1 */