diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2013-03-21 17:33:01 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-21 17:33:01 +0100 |
| commit | f965ebdab662082e3419f5868bb2915fe5cc9a43 (patch) | |
| tree | b8197723deea7f664f4e434d84387b16635695a2 | |
| parent | Merge tag 'ux500-defconfig-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc (diff) | |
| parent | ARM: mach-ux500: enable 128KB way L2 cache on DB8540 (diff) | |
| download | linux-dev-f965ebdab662082e3419f5868bb2915fe5cc9a43.tar.xz linux-dev-f965ebdab662082e3419f5868bb2915fe5cc9a43.zip | |
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: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/cache-l2x0.c | 4 |
2 files changed, 3 insertions, 3 deletions
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 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 |