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

ARM: imx: 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: Sascha Hauer <kernel@pengutronix.de>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parent 14d58cbc

arch/arm/mach-imx/time.c

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static void gpt_irq_acknowledge(void) 


static void __iomem *sched_clock_reg;



static u32 notrace mxc_read_sched_clock(void)

static u64 notrace mxc_read_sched_clock(void)

{

	return sched_clock_reg ? __raw_readl(sched_clock_reg) : 0;

}
@@ -123,7 +123,7 @@ static int __init mxc_clocksource_init(struct clk *timer_clk) 


	sched_clock_reg = reg;



	setup_sched_clock(mxc_read_sched_clock, 32, c);

	sched_clock_register(mxc_read_sched_clock, 32, c);

	return clocksource_mmio_init(reg, "mxc_timer1", c, 200, 32,

			clocksource_mmio_readl_up);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE