From: Linus Walleij <linus.walleij@linaro.org>
Date: Tue, 18 Dec 2012 12:53:09 +0000 (+0100)
Subject: ARM: ux500: bump arch nr of GPIOs
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cca438b57e660c9a4a3216a69405b45ff00274e6;p=deliverable%2Flinux.git

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 <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

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