diff options
| author |   Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 15:26:17 -0800 |
|---|---|---|
| committer |   Kevin Hilman <khilman@linaro.org> | 2013-11-21 15:41:00 -0800 |
| commit | 50f6dca69fbb1ef452e16fae31be54a4f2dce16b (patch) | |
| tree | 66c4971315a6df20661a4e64933720a2c44dac88 | |
| parent | ARM: msm: Switch to sched_clock_register() (diff) | |
| download | linux-dev-50f6dca69fbb1ef452e16fae31be54a4f2dce16b.tar.xz linux-dev-50f6dca69fbb1ef452e16fae31be54a4f2dce16b.zip | |
ARM: OMAP1: 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>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
| -rw-r--r-- | arch/arm/mach-omap1/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c index 6b5f298d6638..a7588cfd0286 100644 --- a/arch/arm/mach-omap1/time.c +++ b/arch/arm/mach-omap1/time.c @@ -181,7 +181,7 @@ static __init void omap_init_mpu_timer(unsigned long rate) * --------------------------------------------------------------------------- */ -static u32 notrace omap_mpu_read_sched_clock(void) +static u64 notrace omap_mpu_read_sched_clock(void) { return ~omap_mpu_timer_read(1); } @@ -193,7 +193,7 @@ static void __init omap_init_clocksource(unsigned long rate) "%s: can't register clocksource!\n"; omap_mpu_timer_start(1, ~0, 1); - setup_sched_clock(omap_mpu_read_sched_clock, 32, rate); + sched_clock_register(omap_mpu_read_sched_clock, 32, rate); if (clocksource_mmio_init(&timer->read_tim, "mpu_timer2", rate, 300, 32, clocksource_mmio_readl_down)) |