diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 18:26:11 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-11-21 18:40:59 -0500 |
commit | 14d58cbc8466ecd93a6a62d9abd812e960cb8a84 (patch) | |
tree | 0ec7db641e5e103b0d326f8ae6ee4da531e49adb /arch/arm/mach-davinci/time.c | |
parent | 161f408978ebbb5a83db05878a7e560acb9c7f21 (diff) |
ARM: davinci: 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: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/mach-davinci/time.c')
-rw-r--r-- | arch/arm/mach-davinci/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c index 56c6eb5266ad..24ad30f32ae3 100644 --- a/arch/arm/mach-davinci/time.c +++ b/arch/arm/mach-davinci/time.c | |||
@@ -285,7 +285,7 @@ static struct clocksource clocksource_davinci = { | |||
285 | /* | 285 | /* |
286 | * Overwrite weak default sched_clock with something more precise | 286 | * Overwrite weak default sched_clock with something more precise |
287 | */ | 287 | */ |
288 | static u32 notrace davinci_read_sched_clock(void) | 288 | static u64 notrace davinci_read_sched_clock(void) |
289 | { | 289 | { |
290 | return timer32_read(&timers[TID_CLOCKSOURCE]); | 290 | return timer32_read(&timers[TID_CLOCKSOURCE]); |
291 | } | 291 | } |
@@ -391,7 +391,7 @@ void __init davinci_timer_init(void) | |||
391 | davinci_clock_tick_rate)) | 391 | davinci_clock_tick_rate)) |
392 | printk(err, clocksource_davinci.name); | 392 | printk(err, clocksource_davinci.name); |
393 | 393 | ||
394 | setup_sched_clock(davinci_read_sched_clock, 32, | 394 | sched_clock_register(davinci_read_sched_clock, 32, |
395 | davinci_clock_tick_rate); | 395 | davinci_clock_tick_rate); |
396 | 396 | ||
397 | /* setup clockevent */ | 397 | /* setup clockevent */ |