aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/nomadik-mtu.c
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2013-07-18 19:21:24 -0400
committerJohn Stultz <john.stultz@linaro.org>2013-07-30 14:24:53 -0400
commite25bc5f5ad192cf8782db64acb83962a0b27c4e0 (patch)
treebaf6c50d2a96ca80af8a4816f1ba8c9bbf499837 /drivers/clocksource/nomadik-mtu.c
parentfcfca6ef6a35690648de6529b607674d4132b10e (diff)
clocksource: nomadik: Switch to sched_clock_register()
The 32 bit sched_clock interface now supports 64 bits. Upgrade to the 64 bit function to allow us to remove the 32 bit registration interface. Cc: Linus Walleij <linus.walleij@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/clocksource/nomadik-mtu.c')
-rw-r--r--drivers/clocksource/nomadik-mtu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c
index 7d2c2c56f73c..2242cd3d618d 100644
--- a/drivers/clocksource/nomadik-mtu.c
+++ b/drivers/clocksource/nomadik-mtu.c
@@ -76,7 +76,7 @@ static struct delay_timer mtu_delay_timer;
76 * local implementation which uses the clocksource to get some 76 * local implementation which uses the clocksource to get some
77 * better resolution when scheduling the kernel. 77 * better resolution when scheduling the kernel.
78 */ 78 */
79static u32 notrace nomadik_read_sched_clock(void) 79static u64 notrace nomadik_read_sched_clock(void)
80{ 80{
81 if (unlikely(!mtu_base)) 81 if (unlikely(!mtu_base))
82 return 0; 82 return 0;
@@ -230,7 +230,7 @@ static void __init __nmdk_timer_init(void __iomem *base, int irq,
230 "mtu_0"); 230 "mtu_0");
231 231
232#ifdef CONFIG_CLKSRC_NOMADIK_MTU_SCHED_CLOCK 232#ifdef CONFIG_CLKSRC_NOMADIK_MTU_SCHED_CLOCK
233 setup_sched_clock(nomadik_read_sched_clock, 32, rate); 233 sched_clock_register(nomadik_read_sched_clock, 32, rate);
234#endif 234#endif
235 235
236 /* Timer 1 is used for events, register irq and clockevents */ 236 /* Timer 1 is used for events, register irq and clockevents */