Commit d9dbcbe0 authored by Stephen Boyd's avatar Stephen Boyd Committed by John Stultz
Browse files

clocksource: time-armada-370-xp: 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: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 35702999

drivers/clocksource/time-armada-370-xp.c

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static u32 ticks_per_jiffy; 


static struct clock_event_device __percpu **percpu_armada_370_xp_evt;



static u32 notrace armada_370_xp_read_sched_clock(void)

static u64 notrace armada_370_xp_read_sched_clock(void)

{

	return ~readl(timer_base + TIMER0_VAL_OFF);

}
@@ -258,7 +258,7 @@ void __init armada_370_xp_timer_init(void) 
	/*

	 * Set scale and timer for sched_clock.

	 */

	setup_sched_clock(armada_370_xp_read_sched_clock, 32, timer_clk);

	sched_clock_register(armada_370_xp_read_sched_clock, 32, timer_clk);



	/*

	 * Setup free-running clocksource timer (interrupts