Commit 26cad74c authored by Stephen Boyd's avatar Stephen Boyd Committed by Kevin Hilman
Browse files

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: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parent 364ed1e0

arch/arm/mach-sa1100/time.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE