diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 15:26:12 -0800 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-11-21 15:40:59 -0800 |
commit | b93767e3bd253d40414609801c3d43e8b241580a (patch) | |
tree | 78104f1f0e87f66c1cdf386911299ee2bdb4e349 /arch/arm/mach-imx/time.c | |
parent | 14d58cbc8466ecd93a6a62d9abd812e960cb8a84 (diff) | |
download | op-kernel-dev-b93767e3bd253d40414609801c3d43e8b241580a.zip op-kernel-dev-b93767e3bd253d40414609801c3d43e8b241580a.tar.gz |
ARM: imx: 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: Sascha Hauer <kernel@pengutronix.de>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/time.c')
-rw-r--r-- | arch/arm/mach-imx/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index 9b6638a..1a3a5f6 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c @@ -111,7 +111,7 @@ static void gpt_irq_acknowledge(void) static void __iomem *sched_clock_reg; -static u32 notrace mxc_read_sched_clock(void) +static u64 notrace mxc_read_sched_clock(void) { return sched_clock_reg ? __raw_readl(sched_clock_reg) : 0; } @@ -123,7 +123,7 @@ static int __init mxc_clocksource_init(struct clk *timer_clk) sched_clock_reg = reg; - setup_sched_clock(mxc_read_sched_clock, 32, c); + sched_clock_register(mxc_read_sched_clock, 32, c); return clocksource_mmio_init(reg, "mxc_timer1", c, 200, 32, clocksource_mmio_readl_up); } |