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

Commit 684e94cb authored by Colin Cross's avatar Colin Cross Committed by Russell King
Browse files

ARM: tegra: timer: Separate clocksource and sched_clock 



tegra_clocksource_read should not use cnt32_to_63, wrapping is
already handled in the clocksource code.  Move the cnt32_to_63
into the sched_clock function, and replace the use of clocksource
mult and shift with a multiplication by 1000 to convert us to ns.

Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Tested-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarColin Cross <ccross@android.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 11e718a6

arch/arm/mach-tegra/timer.c

+3 −4
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static void tegra_timer_set_mode(enum clock_event_mode mode, 


static cycle_t tegra_clocksource_read(struct clocksource *cs)

{

	return cnt32_to_63(timer_readl(TIMERUS_CNTR_1US));

	return timer_readl(TIMERUS_CNTR_1US);

}



static struct clock_event_device tegra_clockevent = {
@@ -106,14 +106,13 @@ static struct clocksource tegra_clocksource = { 
	.name	= "timer_us",

	.rating	= 300,

	.read	= tegra_clocksource_read,

	.mask	= 0x7FFFFFFFFFFFFFFFULL,

	.mask	= CLOCKSOURCE_MASK(32),

	.flags	= CLOCK_SOURCE_IS_CONTINUOUS,

};



unsigned long long sched_clock(void)

{

	return clocksource_cyc2ns(tegra_clocksource.read(&tegra_clocksource),

		tegra_clocksource.mult, tegra_clocksource.shift);

	return cnt32_to_63(timer_readl(TIMERUS_CNTR_1US)) * 1000;

}



static irqreturn_t tegra_timer_interrupt(int irq, void *dev_id)