diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 15:26:18 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-11-21 15:41:00 -0800 |
| commit | f99ba47ccc9f47fbf6ae17e5817d14cc8326d1cc (patch) | |
| tree | 9ff080adb4826d25ad67e44e4e2631018655f986 /arch/arm | |
| parent | 50f6dca69fbb1ef452e16fae31be54a4f2dce16b (diff) | |
| download | blackbird-obmc-linux-f99ba47ccc9f47fbf6ae17e5817d14cc8326d1cc.tar.gz blackbird-obmc-linux-f99ba47ccc9f47fbf6ae17e5817d14cc8326d1cc.zip | |
ARM: OMAP2+: 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: Tony Lindgren <tony@atomide.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Santosh Shilimkar<santosh.shilimkar@ti.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 3ca81e0ada5e..ec084d158f64 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -379,7 +379,7 @@ static struct clocksource clocksource_gpt = { .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; -static u32 notrace dmtimer_read_sched_clock(void) +static u64 notrace dmtimer_read_sched_clock(void) { if (clksrc.reserved) return __omap_dm_timer_read_counter(&clksrc, @@ -471,7 +471,7 @@ static void __init omap2_gptimer_clocksource_init(int gptimer_id, __omap_dm_timer_load_start(&clksrc, OMAP_TIMER_CTRL_ST | OMAP_TIMER_CTRL_AR, 0, OMAP_TIMER_NONPOSTED); - setup_sched_clock(dmtimer_read_sched_clock, 32, clksrc.rate); + sched_clock_register(dmtimer_read_sched_clock, 32, clksrc.rate); if (clocksource_register_hz(&clocksource_gpt, clksrc.rate)) pr_err("Could not register clocksource %s\n", |
