From cca438b57e660c9a4a3216a69405b45ff00274e6 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 18 Dec 2012 13:53:09 +0100 Subject: [PATCH 1/2] ARM: ux500: bump arch nr of GPIOs Set the number of GPIOs for Ux500 to 392. Reasoning: - Internal pinctrl "Nomadik" SoC: 288 GPIOs - Then each Ux500 system has one or two GPIO expanders at maximum 24 GPIOs each: TC35892 expander: 24 GPIOs STMPE1601 or 1801 Expander: 24 GPIOs - Then AB8500/AB8505/AB8540: 56 GPIOs Sum: maximum 392 GPIOs - no more no less. Acked-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5b714695b01b..8b53e77c9ef9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1660,7 +1660,7 @@ config LOCAL_TIMERS config ARCH_NR_GPIO int default 1024 if ARCH_SHMOBILE || ARCH_TEGRA - default 355 if ARCH_U8500 + default 392 if ARCH_U8500 default 264 if MACH_H4700 default 512 if SOC_OMAP5 default 288 if ARCH_VT8500 || ARCH_SUNXI From 0f2fa40e464c955e928979331625b5485c292bf0 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Wed, 23 Jan 2013 11:27:58 +0100 Subject: [PATCH 2/2] ARM: mach-ux500: enable 128KB way L2 cache on DB8540 DB8540 L2 was configured with 64KB way size, but it has 128KB as AP9540. Fix this by modifying ux500_l2x0_init() to use 128KB way size for all cpus in the x540 family. Signed-off-by: Maxime Coquelin Acked-by: Linus Walleij Signed-off-by: Fabio Baltieri Signed-off-by: Linus Walleij --- arch/arm/mach-ux500/cache-l2x0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/cache-l2x0.c b/arch/arm/mach-ux500/cache-l2x0.c index 1c1609da76ce..f815efe54c73 100644 --- a/arch/arm/mach-ux500/cache-l2x0.c +++ b/arch/arm/mach-ux500/cache-l2x0.c @@ -47,8 +47,8 @@ static int __init ux500_l2x0_init(void) /* Unlock before init */ ux500_l2x0_unlock(); - /* DB9540's L2 has 128KB way size */ - if (cpu_is_u9540()) + /* DBx540's L2 has 128KB way size */ + if (cpu_is_ux540_family()) /* 128KB way size */ aux_val |= (0x4 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT); else