diff options
| author |   Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 15:26:20 -0800 |
|---|---|---|
| committer |   Kevin Hilman <khilman@linaro.org> | 2013-11-21 15:41:00 -0800 |
| commit | 26cad74c54b497a629f4e101ef338c5edb67fed5 (patch) | |
| tree | 8c8a07751d0c7fd0e67c0fa691c466b3c9d40837 /arch/arm/mach-sa1100/time.c | |
| parent | ARM: pxa: Switch to sched_clock_register() (diff) | |
| download | linux-dev-26cad74c54b497a629f4e101ef338c5edb67fed5.tar.xz linux-dev-26cad74c54b497a629f4e101ef338c5edb67fed5.zip | |
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 @@ #include <mach/hardware.h> #include <mach/irqs.h> -static u32 notrace sa1100_read_sched_clock(void) +static u64 notrace sa1100_read_sched_clock(void) { return readl_relaxed(OSCR); } @@ -122,7 +122,7 @@ void __init sa1100_timer_init(void) writel_relaxed(0, OIER); writel_relaxed(OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3, OSSR); - setup_sched_clock(sa1100_read_sched_clock, 32, 3686400); + sched_clock_register(sa1100_read_sched_clock, 32, 3686400); ckevt_sa1100_osmr0.cpumask = cpumask_of(0); |