summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx/setup-keypad.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-12-06 12:46:27 +0100
committerLinus Walleij <linus.walleij@linaro.org>2013-12-20 18:19:36 +0100
commit41c3548e6da67786bcaf8ee7b406f6f85ddd816b (patch)
treea1d57c285d2113ce97ca8bfd817a6e42c400474e /arch/arm/mach-s3c64xx/setup-keypad.c
parentc67d0f29262bf6f863ce74d0756618bbd9ba80fd (diff)
downloadop-kernel-dev-41c3548e6da67786bcaf8ee7b406f6f85ddd816b.zip
op-kernel-dev-41c3548e6da67786bcaf8ee7b406f6f85ddd816b.tar.gz
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 'arch/arm/mach-s3c64xx/setup-keypad.c')
-rw-r--r--arch/arm/mach-s3c64xx/setup-keypad.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/setup-keypad.c b/arch/arm/mach-s3c64xx/setup-keypad.c
index 1d4d0ee..e236f40 100644
--- a/arch/arm/mach-s3c64xx/setup-keypad.c
+++ b/arch/arm/mach-s3c64xx/setup-keypad.c
@@ -11,6 +11,7 @@
*/
#include <linux/gpio.h>
+#include <linux/platform_data/gpio-samsung-s3c64xx.h>
#include <plat/gpio-cfg.h>
#include <plat/keypad.h>
OpenPOWER on IntegriCloud