Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e8bac53 authored by Stephen Boyd's avatar Stephen Boyd Committed by Daniel Lezcano
Browse files

clocksource: orion: 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: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 662e7230

drivers/clocksource/time-orion.c

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ EXPORT_SYMBOL(orion_timer_ctrl_clrset); 
/*

 * Free-running clocksource handling.

 */

static u32 notrace orion_read_sched_clock(void)

static u64 notrace orion_read_sched_clock(void)

{

	return ~readl(timer_base + TIMER0_VAL);

}
@@ -135,7 +135,7 @@ static void __init orion_timer_init(struct device_node *np) 
	clocksource_mmio_init(timer_base + TIMER0_VAL, "orion_clocksource",

			      clk_get_rate(clk), 300, 32,

			      clocksource_mmio_readl_down);

	setup_sched_clock(orion_read_sched_clock, 32, clk_get_rate(clk));

	sched_clock_register(orion_read_sched_clock, 32, clk_get_rate(clk));



	/* setup timer1 as clockevent timer */

	if (setup_irq(irq, &orion_clkevt_irq))