summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2013-02-03 12:24:48 +0100
committerArnd Bergmann <arnd@arndb.de>2013-03-11 21:49:46 +0100
commit2a6ad871a10ce915a300d8f227168ad4c34936ec (patch)
tree50f3bd4c4cecf446b4abc481d7f517f3720e6a36
parent51c66cf9695f389126119e4cd7a50b832648f11e (diff)
downloadlinux-3.10-2a6ad871a10ce915a300d8f227168ad4c34936ec.tar.gz
linux-3.10-2a6ad871a10ce915a300d8f227168ad4c34936ec.tar.bz2
linux-3.10-2a6ad871a10ce915a300d8f227168ad4c34936ec.zip
ARM: multiplatform: Sort the max gpio numbers.
When building a multiplatform kernel, we could end up with a smaller number of GPIOs than the one required by the platform the kernel was running on. Sort the max GPIO number by descending order so that we always take the highest number required. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/Kconfig7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5b714695b01..c7e027436f9 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1657,13 +1657,16 @@ config LOCAL_TIMERS
accounting to be spread across the timer interval, preventing a
"thundering herd" at every timer tick.
+# The GPIO number here must be sorted by descending number. In case of
+# a multiplatform kernel, we just want the highest value required by the
+# selected platforms.
config ARCH_NR_GPIO
int
default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
- default 355 if ARCH_U8500
- default 264 if MACH_H4700
default 512 if SOC_OMAP5
+ default 355 if ARCH_U8500
default 288 if ARCH_VT8500 || ARCH_SUNXI
+ default 264 if MACH_H4700
default 0
help
Maximum number of GPIOs in the system.