diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2013-04-20 10:09:17 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-04-26 20:10:46 -0400 |
commit | ea7113f70d6f91dee0d7afd8580c8cac06b6d222 (patch) | |
tree | e395d66efd8aae4cfb237ae82a3167695240fb8f /drivers/clocksource | |
parent | 772ba2ffd2033ecc4451c10b20c01814156ee1b1 (diff) |
clocksource: nomadik-mtu: fix up clocksource/timer
The Nomadik clocksource driver has had a bad define making it
impossible to use it for sched_clock() for a while. Fix this
and also enable it for the Nomadik.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r-- | drivers/clocksource/nomadik-mtu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c index 071f6eadfea2..e405531e1cc5 100644 --- a/drivers/clocksource/nomadik-mtu.c +++ b/drivers/clocksource/nomadik-mtu.c | |||
@@ -67,7 +67,7 @@ static u32 clk_prescale; | |||
67 | static u32 nmdk_cycle; /* write-once */ | 67 | static u32 nmdk_cycle; /* write-once */ |
68 | static struct delay_timer mtu_delay_timer; | 68 | static struct delay_timer mtu_delay_timer; |
69 | 69 | ||
70 | #ifdef CONFIG_NOMADIK_MTU_SCHED_CLOCK | 70 | #ifdef CONFIG_CLKSRC_NOMADIK_MTU_SCHED_CLOCK |
71 | /* | 71 | /* |
72 | * Override the global weak sched_clock symbol with this | 72 | * Override the global weak sched_clock symbol with this |
73 | * local implementation which uses the clocksource to get some | 73 | * local implementation which uses the clocksource to get some |
@@ -233,7 +233,7 @@ void __init nmdk_timer_init(void __iomem *base, int irq) | |||
233 | pr_err("timer: failed to initialize clock source %s\n", | 233 | pr_err("timer: failed to initialize clock source %s\n", |
234 | "mtu_0"); | 234 | "mtu_0"); |
235 | 235 | ||
236 | #ifdef CONFIG_NOMADIK_MTU_SCHED_CLOCK | 236 | #ifdef CONFIG_CLKSRC_NOMADIK_MTU_SCHED_CLOCK |
237 | setup_sched_clock(nomadik_read_sched_clock, 32, rate); | 237 | setup_sched_clock(nomadik_read_sched_clock, 32, rate); |
238 | #endif | 238 | #endif |
239 | 239 | ||