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

Commit 5b0d495c authored by Russell King's avatar Russell King
Browse files

ARM: ixp4xx: convert sched_clock() to use new infrastructure 



Convert ixp4xx to use the new sched_clock() infrastructure for
extending 32bit counters to full 64-bit nanoseconds.

Tested-by: default avatarMikael Pettersson <mikpe@it.uu.se>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 112f38a4

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ config ARCH_IXP4XX 
	select CPU_XSCALE

	select GENERIC_GPIO

	select GENERIC_CLOCKEVENTS

	select HAVE_SCHED_CLOCK

	select DMABOUNCE if PCI

	help

	  Support for Intel's IXP4XX (XScale) family of processors.

arch/arm/mach-ixp4xx/common.c

+20 −11
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <asm/pgtable.h>

#include <asm/page.h>

#include <asm/irq.h>

#include <asm/sched_clock.h>



#include <asm/mach/map.h>

#include <asm/mach/irq.h>
@@ -398,6 +399,23 @@ void __init ixp4xx_sys_init(void) 
			ixp4xx_exp_bus_size >> 20);

}



/*

 * sched_clock()

 */

static DEFINE_CLOCK_DATA(cd);



unsigned long long notrace sched_clock(void)

{

	u32 cyc = *IXP4XX_OSTS;

	return cyc_to_sched_clock(&cd, cyc, (u32)~0);

}



static void notrace ixp4xx_update_sched_clock(void)

{

	u32 cyc = *IXP4XX_OSTS;

	update_sched_clock(&cd, cyc, (u32)~0);

}



/*

 * clocksource

 */
@@ -418,18 +436,9 @@ unsigned long ixp4xx_timer_freq = FREQ; 
EXPORT_SYMBOL(ixp4xx_timer_freq);

static void __init ixp4xx_clocksource_init(void)

{

	clocksource_register_hz(&clocksource_ixp4xx, ixp4xx_timer_freq);

}



/*

 * sched_clock()

 */

unsigned long long notrace sched_clock(void)

{

	cycle_t cyc = ixp4xx_get_cycles(NULL);

	struct clocksource *cs = &clocksource_ixp4xx;

	init_sched_clock(&cd, ixp4xx_update_sched_clock, 32, ixp4xx_timer_freq);



	return clocksource_cyc2ns(cyc, cs->mult, cs->shift);

	clocksource_register_hz(&clocksource_ixp4xx, ixp4xx_timer_freq);

}



/*