Two fixes to the ux500 core machine:

- Enable the 128KB cache on DB8540
 - Bump the number of IRQs to the correct value
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJRRxJFAAoJEEEQszewGV1zR/oP/ReSN9UayBO2xnaPTLmWUWE9
 u2ZAOJZ74CAgFONro8NyBXGsTMFof9V2X72irKqjxo+OSSW9SiREwerZ4mUNhCqG
 sp6lRaEc6o5csFfK1fZwMraASnOuj+WQ19hMBJhBgPh0MKBJL+3shtykkeNdLuTq
 EV/oq7fnvu4eVZxcLhasav8Wu/+aXTREiT5Cg172udCzuoFPi3jceSFAua+UKbjr
 YH22I5rzRQ5RIXv6veQ9w+/Mgd3zUUltBHPUaWUop02Bn/cv0Ppc9Xou4s0Qt0hi
 3sdSIj29XtBGkETJEHtBoY/fQTXfr/z7RC1ohgEE4JAT2qLEgTX3/UPFnHkNgtp+
 FjURTUTfW8eiPQqn5cCk1GWEtAtOl3cMbyVwvfwOgIC0AUQtHwR4y3EMAxw2vesI
 FqgGtP80VUkcP5rYC/71u1fBMjKoieJsDnUBRxmX3FoDA3iTqLYKYh31P2pDHgqF
 M8ZcYHG7Du5+Jc07AKqlIOkZzjqg3ikuE0LwVLcVzzNQyfrVjNumiIQRwhvBHVXW
 dKH1NC2J6IhjyycBP1s8JnwcxCy4UGptOR4DCAvnRaqOIawEKy9sv6F6mj5XuFs0
 U2ZPL35q2ALZsV/BZsTIHarL5C7QrJF+m+HVw0m+ElrQepszuNjDpBaZhVJ5K7Ba
 +h0hElo3geH7I3crL8Q7
 =0LOp
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2013-03-21 17:33:01 +01:00
commit f965ebdab6
2 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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