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

Commit a9d6d151 authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

ARM: 7310/1: integrator: implement sched_clock across all boards 



Now that we can select a sched_clock at runtime, let's implement
it for the Integrator AP, default-select the one found in all
other board it for all plat-versatile boards and make the right
clock kick in at runtime.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f9d4861f

arch/arm/mach-integrator/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ menu "Integrator Options" 
config ARCH_INTEGRATOR_AP

	bool "Support Integrator/AP and Integrator/PP2 platforms"

	select CLKSRC_MMIO

	select HAVE_SCHED_CLOCK

	select MIGHT_HAVE_PCI

	select SERIAL_AMBA_PL010

	select SERIAL_AMBA_PL010_CONSOLE

arch/arm/mach-integrator/integrator_ap.c

+7 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <asm/setup.h>

#include <asm/param.h>		/* HZ */

#include <asm/mach-types.h>

#include <asm/sched_clock.h>



#include <mach/lm.h>
@@ -325,6 +326,11 @@ static void __init ap_init(void) 


static unsigned long timer_reload;



static u32 notrace integrator_read_sched_clock(void)

{

	return -readl((void __iomem *) TIMER2_VA_BASE + TIMER_VALUE);

}



static void integrator_clocksource_init(unsigned long inrate)

{

	void __iomem *base = (void __iomem *)TIMER2_VA_BASE;
@@ -341,6 +347,7 @@ static void integrator_clocksource_init(unsigned long inrate) 


	clocksource_mmio_init(base + TIMER_VALUE, "timer2",

			rate, 200, 16, clocksource_mmio_readl_down);

	setup_sched_clock(integrator_read_sched_clock, 16, rate);

}



static void __iomem * const clkevt_base = (void __iomem *)TIMER1_VA_BASE;

arch/arm/plat-versatile/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ config PLAT_VERSATILE_LEDS 
	depends on ARCH_REALVIEW || ARCH_VERSATILE



config PLAT_VERSATILE_SCHED_CLOCK

	def_bool y if !ARCH_INTEGRATOR_AP

	def_bool y

	select HAVE_SCHED_CLOCK



endif