Skip to content

Commit

Permalink
ARM: sa1100: Switch to sched_clock_register()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Boyd authored and Kevin Hilman committed Nov 21, 2013
1 parent 364ed1e commit 26cad74
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-sa1100/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 26cad74

Please sign in to comment.