From 0b260fd4b0eb7c90f9258bfa6317ae553319b5da Mon Sep 17 00:00:00 2001 From: Alessandro Rubini Date: Thu, 2 Jul 2009 15:29:43 +0100 Subject: [ARM] 5587/1: nomadik: add l2cc Signed-off-by: Alessandro Rubini Acked-by: Andrea Gallo Signed-off-by: Russell King --- arch/arm/mach-nomadik/cpu-8815.c | 8 +++++++- arch/arm/mm/Kconfig | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index 9917a9abdb5..f93c5963419 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c @@ -27,6 +27,9 @@ #include #include +#include +#include + /* The 8815 has 4 GPIO blocks, let's register them immediately */ static struct nmk_gpio_platform_data cpu8815_gpio[] = { { @@ -125,9 +128,12 @@ void __init cpu8815_init_irq(void) /* * This function is called from the board init ("init_machine"). - * Currently nothing is done as we can't register amba devs so early. */ void __init cpu8815_platform_init(void) { +#ifdef CONFIG_CACHE_L2X0 + /* At full speed latency must be >=2, so 0x249 in low bits */ + l2x0_init(io_p2v(NOMADIK_L2CC_BASE), 0x00730249, 0xfe000fff); +#endif return; } diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 83c025e72ce..5fe595aeba6 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -758,7 +758,7 @@ config CACHE_FEROCEON_L2_WRITETHROUGH config CACHE_L2X0 bool "Enable the L2x0 outer cache controller" depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ - REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX + REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || ARCH_NOMADIK default y select OUTER_CACHE help -- cgit v1.2.3