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

clocksource: bcm2835: 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: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent e7e3ff1b

drivers/clocksource/bcm2835_timer.c

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct bcm2835_timer { 


static void __iomem *system_clock __read_mostly;



static u32 notrace bcm2835_sched_read(void)

static u64 notrace bcm2835_sched_read(void)

{

	return readl_relaxed(system_clock);

}
@@ -110,7 +110,7 @@ static void __init bcm2835_timer_init(struct device_node *node) 
		panic("Can't read clock-frequency");



	system_clock = base + REG_COUNTER_LO;

	setup_sched_clock(bcm2835_sched_read, 32, freq);

	sched_clock_register(bcm2835_sched_read, 32, freq);



	clocksource_mmio_init(base + REG_COUNTER_LO, node->name,

		freq, 300, 32, clocksource_mmio_readl_up);