leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: sa1100: Switch to sched_clock_register()

Browse Source 
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>
This commit is contained in:
Stephen Boyd 2013-11-15 15:26:20 -08:00 committed by Kevin Hilman
parent 364ed1e0ab
commit 26cad74c54
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-sa1100/time.c
View File

@ -20,7 +20,7 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/irqs.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); return readl_relaxed(OSCR);
} }
@ -122,7 +122,7 @@ void __init sa1100_timer_init(void)
writel_relaxed(0, OIER); writel_relaxed(0, OIER);
writel_relaxed(OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3, OSSR); 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); ckevt_sa1100_osmr0.cpumask = cpumask_of(0);