summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2013-07-19 03:21:22 +0400
committerJohn Stultz <john.stultz@linaro.org>2013-07-30 22:24:52 +0400
commitfa8296ae62364d80bb82c4c011469ae3e423d509 (patch)
tree2c387a836e433028523cf6c8b0c4abda298f22d0
parent5602d7c808aa99230ab1ef1598e2425cf2acedc5 (diff)
downloadlinux-fa8296ae62364d80bb82c4c011469ae3e423d509.tar.xz
clocksource: dw_apb_timer_of: 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> Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--drivers/clocksource/dw_apb_timer_of.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c
index 4cbae4f762b1..003b2309f463 100644
--- a/drivers/clocksource/dw_apb_timer_of.c
+++ b/drivers/clocksource/dw_apb_timer_of.c
@@ -106,7 +106,7 @@ static void add_clocksource(struct device_node *source_timer)
sched_rate = rate;
}
-static u32 read_sched_clock(void)
+static u64 read_sched_clock(void)
{
return __raw_readl(sched_io_base);
}
@@ -128,7 +128,7 @@ static void init_sched_clock(void)
of_node_put(sched_timer);
}
- setup_sched_clock(read_sched_clock, 32, sched_rate);
+ sched_clock_register(read_sched_clock, 32, sched_rate);
}
static int num_called;