diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2013-12-06 06:46:27 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-12-20 12:19:36 -0500 |
commit | 41c3548e6da67786bcaf8ee7b406f6f85ddd816b (patch) | |
tree | a1d57c285d2113ce97ca8bfd817a6e42c400474e /arch/arm/Kconfig | |
parent | c67d0f29262bf6f863ce74d0756618bbd9ba80fd (diff) |
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/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6a26bcb3a63a..103437986684 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -732,7 +732,6 @@ config ARCH_S3C64XX | |||
732 | select HAVE_S3C2410_I2C if I2C | 732 | select HAVE_S3C2410_I2C if I2C |
733 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | 733 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
734 | select HAVE_TCM | 734 | select HAVE_TCM |
735 | select NEED_MACH_GPIO_H | ||
736 | select NO_IOPORT | 735 | select NO_IOPORT |
737 | select PLAT_SAMSUNG | 736 | select PLAT_SAMSUNG |
738 | select PM_GENERIC_DOMAINS | 737 | select PM_GENERIC_DOMAINS |
@@ -1592,7 +1591,7 @@ config ARM_PSCI | |||
1592 | config ARCH_NR_GPIO | 1591 | config ARCH_NR_GPIO |
1593 | int | 1592 | int |
1594 | default 1024 if ARCH_SHMOBILE || ARCH_TEGRA | 1593 | default 1024 if ARCH_SHMOBILE || ARCH_TEGRA |
1595 | default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || SOC_DRA7XX || ARCH_S3C24XX | 1594 | default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || SOC_DRA7XX || ARCH_S3C24XX || ARCH_S3C64XX |
1596 | default 392 if ARCH_U8500 | 1595 | default 392 if ARCH_U8500 |
1597 | default 352 if ARCH_VT8500 | 1596 | default 352 if ARCH_VT8500 |
1598 | default 288 if ARCH_SUNXI | 1597 | default 288 if ARCH_SUNXI |