diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-12-06 15:46:27 +0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-12-20 21:19:36 +0400 |
| commit | 41c3548e6da67786bcaf8ee7b406f6f85ddd816b (patch) | |
| tree | a1d57c285d2113ce97ca8bfd817a6e42c400474e /drivers/gpio/gpio-samsung.c | |
| parent | c67d0f29262bf6f863ce74d0756618bbd9ba80fd (diff) | |
| download | linux-41c3548e6da67786bcaf8ee7b406f6f85ddd816b.tar.xz | |
ARM: s3c64xx: get rid of custom <mach/gpio.h>
This isolates the custom S3C64xx GPIO definition table to
<linux/platform_data/gpio-samsung-s3x64xx.h> as this is
used in a few different places in the kernel, removing the
need to depend on the implicit inclusion of <mach/gpio.h>
from <linux/gpio.h> and thus getting rid of a few nasty
cross-dependencies.
Also delete the CONFIG_SAMSUNG_GPIO_EXTRA stuff. Instead
roof the number of GPIOs for this platform:
First sum up all the GPIO banks from A to Q: 187 GPIOs.
Add the 16 "board GPIOs" and the roof for SAMSUNG_GPIO_EXTRA,
128, so in total maximum 187+16+128 = 331 GPIOs, so let's
take the same roof as for S3C24XX: 512. This way we can do
away with the GPIO calculation macros for GPIO_BOARD_START,
BOARD_NR_GPIOS and the definition of ARCH_NR_GPIOS.
Cc: Mark Brown <broonie@kernel.org>
[on Mini6410 board]
Tested-by: Tomasz Figa <t.figa@samsung.com>
[for changes in mach-s3c64xx]
Acked-by: Tomasz Figa <t.figa@samsung.com>
Tested-by: Mark Brown <broonie@linaro.org>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-samsung.c')
| -rw-r--r-- | drivers/gpio/gpio-samsung.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index 268214c57799..be7b0bd4eed4 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c @@ -30,6 +30,9 @@ #ifdef CONFIG_ARCH_S3C24XX #include <linux/platform_data/gpio-samsung-s3c24xx.h> #endif +#ifdef CONFIG_ARCH_S3C64XX +#include <linux/platform_data/gpio-samsung-s3c64xx.h> +#endif #include <asm/irq.h> |