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

ARM: IXP4xx: 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: Imre Kaloz <kaloz@openwrt.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Acked-by: default avatarKrzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parent 7a4143fa

arch/arm/mach-ixp4xx/common.c

+2 −2
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ void __init ixp4xx_sys_init(void) 
/*

 * sched_clock()

 */

static u32 notrace ixp4xx_read_sched_clock(void)

static u64 notrace ixp4xx_read_sched_clock(void)

{

	return *IXP4XX_OSTS;

}
@@ -466,7 +466,7 @@ unsigned long ixp4xx_timer_freq = IXP4XX_TIMER_FREQ; 
EXPORT_SYMBOL(ixp4xx_timer_freq);

static void __init ixp4xx_clocksource_init(void)

{

	setup_sched_clock(ixp4xx_read_sched_clock, 32, ixp4xx_timer_freq);

	sched_clock_register(ixp4xx_read_sched_clock, 32, ixp4xx_timer_freq);



	clocksource_mmio_init(NULL, "OSTS", ixp4xx_timer_freq, 200, 32,

			ixp4xx_clocksource_read);

CRA Git | Maintained and supported by SUSTech CRA and CCSE