diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 18:26:20 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-11-21 18:41:00 -0500 |
commit | 26cad74c54b497a629f4e101ef338c5edb67fed5 (patch) | |
tree | 8c8a07751d0c7fd0e67c0fa691c466b3c9d40837 /arch/arm/mach-sa1100/time.c | |
parent | 364ed1e0ab019d83ae08c9de06b3ec576e0c17c6 (diff) |
ARM: sa1100: 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: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/mach-sa1100/time.c')
-rw-r--r-- | arch/arm/mach-sa1100/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c index 713c86cd3d64..6fd4acb8f187 100644 --- a/arch/arm/mach-sa1100/time.c +++ b/arch/arm/mach-sa1100/time.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <mach/hardware.h> | 20 | #include <mach/hardware.h> |
21 | #include <mach/irqs.h> | 21 | #include <mach/irqs.h> |
22 | 22 | ||
23 | static u32 notrace sa1100_read_sched_clock(void) | 23 | static u64 notrace sa1100_read_sched_clock(void) |
24 | { | 24 | { |
25 | return readl_relaxed(OSCR); | 25 | return readl_relaxed(OSCR); |
26 | } | 26 | } |
@@ -122,7 +122,7 @@ void __init sa1100_timer_init(void) | |||
122 | writel_relaxed(0, OIER); | 122 | writel_relaxed(0, OIER); |
123 | writel_relaxed(OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3, OSSR); | 123 | writel_relaxed(OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3, OSSR); |
124 | 124 | ||
125 | setup_sched_clock(sa1100_read_sched_clock, 32, 3686400); | 125 | sched_clock_register(sa1100_read_sched_clock, 32, 3686400); |
126 | 126 | ||
127 | ckevt_sa1100_osmr0.cpumask = cpumask_of(0); | 127 | ckevt_sa1100_osmr0.cpumask = cpumask_of(0); |
128 | 128 | ||