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

clocksource: mxs_timer: 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: Shawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent fa8296ae

drivers/clocksource/mxs_timer.c

+2 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static struct clocksource clocksource_mxs = { 
	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

};



static u32 notrace mxs_read_sched_clock_v2(void)

static u64 notrace mxs_read_sched_clock_v2(void)

{

	return ~readl_relaxed(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1));

}
@@ -236,7 +236,7 @@ static int __init mxs_clocksource_init(struct clk *timer_clk) 
	else {

		clocksource_mmio_init(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1),

			"mxs_timer", c, 200, 32, clocksource_mmio_readl_down);

		setup_sched_clock(mxs_read_sched_clock_v2, 32, c);

		sched_clock_register(mxs_read_sched_clock_v2, 32, c);

	}



	return 0;