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

Commit f258b0c6 authored by Kevin Hilman's avatar Kevin Hilman Committed by Tony Lindgren
Browse files

ARM: OMAP: Timer32K: Move 32k-based sched_clock() to common code 



Since 32k timer code is moving to OMAP1 specific dir, move the
32k-based sched_clock() into common code where it is based on the 32k
sync counter and can be used even when using MPU timer.

While moving, change the ticks-to-nsecs conversion to use the helper
functions provided by clocksource.h.

Also removed the unused ticks_to_usec, leaving only ticks_to_nsec.

Signed-off-by: default avatarKevin Hilman <khilman@mvista.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 5a3a388f

arch/arm/plat-omap/common.c

+17 −0
Original line number Diff line number Diff line
@@ -193,6 +193,23 @@ static struct clocksource clocksource_32k = { 
	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

};



/*

 * Rounds down to nearest nsec.

 */

unsigned long long omap_32k_ticks_to_nsecs(unsigned long ticks_32k)

{

	return cyc2ns(&clocksource_32k, ticks_32k);

}



/*

 * Returns current time from boot in nsecs. It's OK for this to wrap

 * around for now, as it's just a relative time stamp.

 */

unsigned long long sched_clock(void)

{

	return omap_32k_ticks_to_nsecs(omap_32k_read());

}



static int __init omap_init_clocksource_32k(void)

{

	static char err[] __initdata = KERN_ERR

arch/arm/plat-omap/timer32k.c

+0 −26
Original line number Diff line number Diff line
@@ -153,32 +153,6 @@ static inline unsigned long omap_32k_sync_timer_read(void) 
	return omap_readl(TIMER_32K_SYNCHRONIZED);

}



/*

 * Rounds down to nearest usec. Note that this will overflow for larger values.

 */

static inline unsigned long omap_32k_ticks_to_usecs(unsigned long ticks_32k)

{

	return (ticks_32k * 5*5*5*5*5*5) >> 9;

}



/*

 * Rounds down to nearest nsec.

 */

static inline unsigned long long

omap_32k_ticks_to_nsecs(unsigned long ticks_32k)

{

	return (unsigned long long) ticks_32k * 1000 * 5*5*5*5*5*5 >> 9;

}



/*

 * Returns current time from boot in nsecs. It's OK for this to wrap

 * around for now, as it's just a relative time stamp.

 */

unsigned long long sched_clock(void)

{

	return omap_32k_ticks_to_nsecs(omap_32k_sync_timer_read());

}



static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id)

{

	struct clock_event_device *evt = &clockevent_32k_timer;