From aa6aedb547209391db75b2e4fdbce6b442fd5891 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 16 Feb 2016 16:40:38 +0100 Subject: [PATCH] gpio: allow setting ARCH_NR_GPIOS from Kconfig The ARM version of asm/gpio.h basically just contains the same definitions as the gpiolib version, with the exception of ARCH_NR_GPIOS. This adds the option for overriding the constant through Kconfig to the architecture-independent header, so we can remove the ARM specific file later. Signed-off-by: Arnd Bergmann Signed-off-by: Linus Walleij --- include/asm-generic/gpio.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index 40ec1433f05de..8ca627dcea110 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -26,8 +26,12 @@ */ #ifndef ARCH_NR_GPIOS +#if defined(CONFIG_ARCH_NR_GPIO) && CONFIG_ARCH_NR_GPIO > 0 +#define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO +#else #define ARCH_NR_GPIOS 512 #endif +#endif /* * "valid" GPIO numbers are nonnegative and may be passed to