diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-07-18 19:21:23 -0400 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2013-07-30 14:24:52 -0400 |
commit | fcfca6ef6a35690648de6529b607674d4132b10e (patch) | |
tree | 0cc94379e434759430d4eec67cfa291f971b5761 | |
parent | fa8296ae62364d80bb82c4c011469ae3e423d509 (diff) |
clocksource: mxs_timer: 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: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r-- | drivers/clocksource/mxs_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c index 0f5e65f74dc3..445b68a01dc5 100644 --- a/drivers/clocksource/mxs_timer.c +++ b/drivers/clocksource/mxs_timer.c | |||
@@ -222,7 +222,7 @@ static struct clocksource clocksource_mxs = { | |||
222 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 222 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
223 | }; | 223 | }; |
224 | 224 | ||
225 | static u32 notrace mxs_read_sched_clock_v2(void) | 225 | static u64 notrace mxs_read_sched_clock_v2(void) |
226 | { | 226 | { |
227 | return ~readl_relaxed(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1)); | 227 | return ~readl_relaxed(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1)); |
228 | } | 228 | } |
@@ -236,7 +236,7 @@ static int __init mxs_clocksource_init(struct clk *timer_clk) | |||
236 | else { | 236 | else { |
237 | clocksource_mmio_init(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1), | 237 | clocksource_mmio_init(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1), |
238 | "mxs_timer", c, 200, 32, clocksource_mmio_readl_down); | 238 | "mxs_timer", c, 200, 32, clocksource_mmio_readl_down); |
239 | setup_sched_clock(mxs_read_sched_clock_v2, 32, c); | 239 | sched_clock_register(mxs_read_sched_clock_v2, 32, c); |
240 | } | 240 | } |
241 | 241 | ||
242 | return 0; | 242 | return 0; |