diff options
| author |   Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 15:26:11 -0800 |
|---|---|---|
| committer |   Kevin Hilman <khilman@linaro.org> | 2013-11-21 15:40:59 -0800 |
| commit | 14d58cbc8466ecd93a6a62d9abd812e960cb8a84 (patch) | |
| tree | 0ec7db641e5e103b0d326f8ae6ee4da531e49adb /arch/arm/mach-davinci | |
| parent | ARM: clps711x: Switch to sched_clock_register() (diff) | |
| download | linux-dev-14d58cbc8466ecd93a6a62d9abd812e960cb8a84.tar.xz linux-dev-14d58cbc8466ecd93a6a62d9abd812e960cb8a84.zip | |
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')
| -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 = { /* * Overwrite weak default sched_clock with something more precise */ -static u32 notrace davinci_read_sched_clock(void) +static u64 notrace davinci_read_sched_clock(void) { return timer32_read(&timers[TID_CLOCKSOURCE]); } @@ -391,7 +391,7 @@ void __init davinci_timer_init(void) davinci_clock_tick_rate)) printk(err, clocksource_davinci.name); - setup_sched_clock(davinci_read_sched_clock, 32, + sched_clock_register(davinci_read_sched_clock, 32, davinci_clock_tick_rate); /* setup clockevent */ |