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

Commit d77e270c authored by Russell King's avatar Russell King
Browse files

ARM: integrator: add Integrator/CP sched_clock support 



Integrator/CP has the 24MHz counter which Versatile and later platforms
also have, which we use for sched_clock support.  Allow this counter to
be used when building a kernel targetting Integrator/CP alone.
Integrator/AP does not have this counter, so we must exclude support
for the Integrator family when this is enabled.

Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0462b447

arch/arm/mach-integrator/integrator_cp.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ 




#include <plat/clcd.h>

#include <plat/clcd.h>

#include <plat/fpga-irq.h>

#include <plat/fpga-irq.h>

#include <plat/sched_clock.h>





#include "common.h"

#include "common.h"
@@ -440,11 +441,17 @@ static struct amba_device *amba_devs[] __initdata = { 
	&clcd_device,

	&clcd_device,

};

};





#define REFCOUNTER (__io_address(INTEGRATOR_HDR_BASE) + 0x28)



static void __init intcp_init_early(void)

static void __init intcp_init_early(void)

{

{

	clkdev_add_table(cp_lookups, ARRAY_SIZE(cp_lookups));

	clkdev_add_table(cp_lookups, ARRAY_SIZE(cp_lookups));





	integrator_init_early();

	integrator_init_early();



#ifdef CONFIG_PLAT_VERSATILE_SCHED_CLOCK

	versatile_sched_clock_init(REFCOUNTER, 24000000);

#endif

}

}





static void __init intcp_init(void)

static void __init intcp_init(void)

arch/arm/plat-versatile/Kconfig

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

	depends on ARCH_REALVIEW || ARCH_VERSATILE





config PLAT_VERSATILE_SCHED_CLOCK

config PLAT_VERSATILE_SCHED_CLOCK

	def_bool y if !ARCH_INTEGRATOR

	def_bool y if !ARCH_INTEGRATOR_AP

	select HAVE_SCHED_CLOCK

	select HAVE_SCHED_CLOCK





endif
 
endif