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

Commit f965ebda authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ux500-core-v3.10' of... 

Merge tag 'ux500-core-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc

From Linus Walleij <linus.walleij@linaro.org>:

Two fixes to the ux500 core machine:
- Enable the 128KB cache on DB8540
- Bump the number of IRQs to the correct value

* tag 'ux500-core-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

:
  ARM: mach-ux500: enable 128KB way L2 cache on DB8540
  ARM: ux500: bump arch nr of GPIOs

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b7ab76d2 0f2fa40e

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-ux500/cache-l2x0.c

+2 −2
Original line number Diff line number Diff line
@@ -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