diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 18:26:12 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-11-21 18:40:59 -0500 |
commit | b93767e3bd253d40414609801c3d43e8b241580a (patch) | |
tree | 78104f1f0e87f66c1cdf386911299ee2bdb4e349 | |
parent | 14d58cbc8466ecd93a6a62d9abd812e960cb8a84 (diff) |
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>
-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 9b6638aadeaa..1a3a5f615770 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) | |||
111 | 111 | ||
112 | static void __iomem *sched_clock_reg; | 112 | static void __iomem *sched_clock_reg; |
113 | 113 | ||
114 | static u32 notrace mxc_read_sched_clock(void) | 114 | static u64 notrace mxc_read_sched_clock(void) |
115 | { | 115 | { |
116 | return sched_clock_reg ? __raw_readl(sched_clock_reg) : 0; | 116 | return sched_clock_reg ? __raw_readl(sched_clock_reg) : 0; |
117 | } | 117 | } |
@@ -123,7 +123,7 @@ static int __init mxc_clocksource_init(struct clk *timer_clk) | |||
123 | 123 | ||
124 | sched_clock_reg = reg; | 124 | sched_clock_reg = reg; |
125 | 125 | ||
126 | setup_sched_clock(mxc_read_sched_clock, 32, c); | 126 | sched_clock_register(mxc_read_sched_clock, 32, c); |
127 | return clocksource_mmio_init(reg, "mxc_timer1", c, 200, 32, | 127 | return clocksource_mmio_init(reg, "mxc_timer1", c, 200, 32, |
128 | clocksource_mmio_readl_up); | 128 | clocksource_mmio_readl_up); |
129 | } | 129 | } |