diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-03 08:15:37 +0100 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-11-08 11:56:02 +0100 |
| commit | b462c20e2915e6eca2fb812b4f63c94e7e042b9a (patch) | |
| tree | 99d8e0aa642e9d7145707e7627b4ffbd26bd59dd /arch/arm/mach-s3c64xx/include/mach/gpio.h | |
| parent | Linux 3.2-rc1 (diff) | |
| download | linux-b462c20e2915e6eca2fb812b4f63c94e7e042b9a.tar.xz linux-b462c20e2915e6eca2fb812b4f63c94e7e042b9a.zip | |
ARM: S3C64XX: Update for conversion to SAMSUNG_GPIO_EXTRA
The conversion of the S3C64XX GPIOs to the generic Samsung GPIOs mean that
rather than using the previous S3C24XX_GPIO_EXTRA configuration the driver
now uses SAMSUNG_GPIO_EXTRA.
Since SAMSUNG_GPIO_EXTRA requires the arch to include the extra space in
ARCH_NR_GPIOs add it on to BOARD_NR_GPIOs (in case boards are relying on
the existing reservation).
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c64xx/include/mach/gpio.h')
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/gpio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio.h b/arch/arm/mach-s3c64xx/include/mach/gpio.h index 6e34c2f6e670..8b540c42d5dd 100644 --- a/arch/arm/mach-s3c64xx/include/mach/gpio.h +++ b/arch/arm/mach-s3c64xx/include/mach/gpio.h @@ -88,6 +88,6 @@ enum s3c_gpio_number { /* define the number of gpios we need to the one after the GPQ() range */ #define GPIO_BOARD_START (S3C64XX_GPQ(S3C64XX_GPIO_Q_NR) + 1) -#define BOARD_NR_GPIOS 16 +#define BOARD_NR_GPIOS (16 + CONFIG_SAMSUNG_GPIO_EXTRA) #define ARCH_NR_GPIOS (GPIO_BOARD_START + BOARD_NR_GPIOS) |