diff options
| author | Peter De Schrijver (NVIDIA) <pdeschrijver@nvidia.com> | 2011-12-21 13:50:42 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-24 02:54:51 +0400 |
| commit | 4f3f25821cc2d75e65046949200c514ddd00c6a8 (patch) | |
| tree | 94cacbf44bbc689d0cba07cca4e4ee713533fba1 /arch | |
| parent | 3dea19e826da3dd43b3dc308aca299c0b7263c6b (diff) | |
| download | linux-4f3f25821cc2d75e65046949200c514ddd00c6a8.tar.xz | |
ARM: 7241/1: mach-ux500 Use CONFIG_ARCH_NR_GPIO
Add default value for CONFIG_ARCH_NR_GPIO to Kconfig and remove the
definition in gpio.h. We can't remove gpio.h yet as asm/gpio.h still
includes it.
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/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/gpio.h | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index dbd2cb19924a..4e53bf678f70 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1568,6 +1568,7 @@ config LOCAL_TIMERS config ARCH_NR_GPIO int default 1024 if ARCH_SHMOBILE || ARCH_TEGRA + default 350 if ARCH_U8500 default 0 help Maximum number of GPIOs in the system. diff --git a/arch/arm/mach-ux500/include/mach/gpio.h b/arch/arm/mach-ux500/include/mach/gpio.h index 7389df911b1a..c01ef66537f3 100644 --- a/arch/arm/mach-ux500/include/mach/gpio.h +++ b/arch/arm/mach-ux500/include/mach/gpio.h @@ -1,10 +1,5 @@ #ifndef __ASM_ARCH_GPIO_H #define __ASM_ARCH_GPIO_H -/* - * 288 (#267 is the highest one actually hooked up) onchip GPIOs, plus enough - * room for a couple of GPIO expanders. - */ -#define ARCH_NR_GPIOS 350 #endif /* __ASM_ARCH_GPIO_H */ |