diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-13 16:24:46 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:02:50 +0200 |
| commit | fd0ba2d130f49f50be42c1ceb70c49e80daa0eac (patch) | |
| tree | c0110716c3e77a7335f1ad94aac92e6cfcfe1d3a | |
| parent | 328274f4e0f835112b41901e106884adb1fffa08 (diff) | |
mach-ux500: gpio: Moved the NOMADIK_NR_GPIO
Move the NOMADIK_NR_GPIO to the right
location.
Fix warnings generated by this change.
ST-Ericsson Linux next: ER 340134
ST-Ericsson ID: 340139
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Change-Id: I5b69d4a4662b707d815a867b2b5be19e4675d010
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24082
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/gpio.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/include/mach/gpio.h b/arch/arm/mach-ux500/include/mach/gpio.h index c01ef66537f..8571446b09b 100644 --- a/arch/arm/mach-ux500/include/mach/gpio.h +++ b/arch/arm/mach-ux500/include/mach/gpio.h @@ -1,5 +1,17 @@ #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. + */ + +#if CONFIG_ARCH_NR_GPIO > 0 +#define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO +#else +#define ARCH_NR_GPIOS 355 +#endif + +#define NOMADIK_NR_GPIO 288 #endif /* __ASM_ARCH_GPIO_H */ |