diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 15:26:13 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-11-21 15:41:00 -0800 |
| commit | 7a4143fac83e8be9ca9ee01d612687f407623cc3 (patch) | |
| tree | 9b2097591bc8bd8e1035ce256ec49fd069af8d3e | |
| parent | b93767e3bd253d40414609801c3d43e8b241580a (diff) | |
| download | op-kernel-dev-7a4143fac83e8be9ca9ee01d612687f407623cc3.zip op-kernel-dev-7a4143fac83e8be9ca9ee01d612687f407623cc3.tar.gz | |
ARM: integrator: 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.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
| -rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index d50dc2d..473e21b 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -277,7 +277,7 @@ struct amba_pl010_data ap_uart_data = { static unsigned long timer_reload; -static u32 notrace integrator_read_sched_clock(void) +static u64 notrace integrator_read_sched_clock(void) { return -readl((void __iomem *) TIMER2_VA_BASE + TIMER_VALUE); } @@ -298,7 +298,7 @@ static void integrator_clocksource_init(unsigned long inrate, clocksource_mmio_init(base + TIMER_VALUE, "timer2", rate, 200, 16, clocksource_mmio_readl_down); - setup_sched_clock(integrator_read_sched_clock, 16, rate); + sched_clock_register(integrator_read_sched_clock, 16, rate); } static void __iomem * clkevt_base; |
