summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPeter De Schrijver (NVIDIA) <pdeschrijver@nvidia.com>2011-12-21 10:48:45 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-12-23 22:54:50 +0000
commit44986ab056076e9dc9fb9f8b4729afef7fa72616 (patch)
treeea8231c1bd85cb97daa89b3fe377a0a537ad24fa /arch
parent7c324d837f214290febac87da6815dff1ed41d04 (diff)
ARM: 7240/1: Make ARCH_NR_GPIO a Kconfig variable
Change ARCH_NR_GPIO into a Kconfig variable as suggested by Russel King. This makes ARCH_NR_GPIO single zImage friendly. The default value for tegra is defined as well. Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig9
-rw-r--r--arch/arm/include/asm/gpio.h4
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e063d34ac7b9..003b7d00dd60 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1565,6 +1565,15 @@ config LOCAL_TIMERS
accounting to be spread across the timer interval, preventing a
"thundering herd" at every timer tick.
+config ARCH_NR_GPIO
+ int
+ default 1024 if ARCH_TEGRA
+ default 0
+ help
+ Maximum number of GPIOs in the system.
+
+ If unsure, leave the default value.
+
source kernel/Kconfig.preempt
config HZ
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
index 11ad0bfbb0ad..7151753b0989 100644
--- a/arch/arm/include/asm/gpio.h
+++ b/arch/arm/include/asm/gpio.h
@@ -1,6 +1,10 @@
#ifndef _ARCH_ARM_GPIO_H
#define _ARCH_ARM_GPIO_H
+#if CONFIG_ARCH_NR_GPIO > 0
+#define ARCH_NR_GPIO CONFIG_ARCH_NR_GPIO
+#endif
+
/* not all ARM platforms necessarily support this API ... */
#include <mach/gpio.h>