Browse Source

ARM: s3c24xx: get rid of custom <mach/gpio.h>

This isolates the custom S3C24xx GPIO definition table to
<linux/platform_data/gpio-samsung-s3x24xx.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.

We also delete the nifty CONFIG_S3C24XX_GPIO_EXTRA stuff.
The biggest this can ever be for the S3C24XX is
CONFIG_S3C24XX_GPIO_EXTRA = 128, and then for CPU_S3C2443 or
CPU_S3C2416 32*12 GPIOs are added, so 32*12+128 = 512
is the absolute roof value on this platform. So we set
the size of ARCH_NR_GPIO to this and the GPIOs array will
fit any S3C24XX platform, as per pattern from other archs.

ChangeLog v2->v3:
- Move the movement of the S3C64XX gpio.h file out of
  this patch and into the follow-up patch where it belongs.
ChangeLog v1->v2:
- Added an #ifdef ARCH_S3C24XX around the header inclusion
  in drivers/gpio/gpio-samsung.c as we would otherwise
  have colliding definitions when compiling S3C64XX.
- Rename inclusion guard in the header file.

Cc: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: linux-samsung-soc@vger.kernel.org
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
isee-imx_3.14.28.y
Linus Walleij 7 years ago
parent
commit
c67d0f2926
37 changed files with 42 additions and 35 deletions
  1. +1
    -2
      arch/arm/Kconfig
  2. +0
    -21
      arch/arm/mach-s3c24xx/Kconfig
  3. +1
    -1
      arch/arm/mach-s3c24xx/common-smdk.c
  4. +1
    -0
      arch/arm/mach-s3c24xx/h1940-bluetooth.c
  5. +1
    -0
      arch/arm/mach-s3c24xx/mach-amlm5900.c
  6. +1
    -0
      arch/arm/mach-s3c24xx/mach-anubis.c
  7. +1
    -0
      arch/arm/mach-s3c24xx/mach-at2440evb.c
  8. +1
    -0
      arch/arm/mach-s3c24xx/mach-bast.c
  9. +1
    -0
      arch/arm/mach-s3c24xx/mach-gta02.c
  10. +1
    -0
      arch/arm/mach-s3c24xx/mach-h1940.c
  11. +1
    -0
      arch/arm/mach-s3c24xx/mach-jive.c
  12. +1
    -0
      arch/arm/mach-s3c24xx/mach-mini2440.c
  13. +1
    -0
      arch/arm/mach-s3c24xx/mach-n30.c
  14. +1
    -0
      arch/arm/mach-s3c24xx/mach-nexcoder.c
  15. +1
    -0
      arch/arm/mach-s3c24xx/mach-osiris.c
  16. +1
    -0
      arch/arm/mach-s3c24xx/mach-qt2410.c
  17. +1
    -0
      arch/arm/mach-s3c24xx/mach-rx1950.c
  18. +1
    -0
      arch/arm/mach-s3c24xx/mach-rx3715.c
  19. +1
    -0
      arch/arm/mach-s3c24xx/mach-smdk2413.c
  20. +1
    -0
      arch/arm/mach-s3c24xx/mach-smdk2416.c
  21. +1
    -0
      arch/arm/mach-s3c24xx/mach-vr1000.c
  22. +1
    -0
      arch/arm/mach-s3c24xx/pm-s3c2410.c
  23. +1
    -0
      arch/arm/mach-s3c24xx/pm.c
  24. +1
    -0
      arch/arm/mach-s3c24xx/s3c2410.c
  25. +1
    -0
      arch/arm/mach-s3c24xx/s3c2416.c
  26. +1
    -0
      arch/arm/mach-s3c24xx/s3c2440.c
  27. +1
    -0
      arch/arm/mach-s3c24xx/s3c2442.c
  28. +1
    -0
      arch/arm/mach-s3c24xx/s3c2443.c
  29. +1
    -0
      arch/arm/mach-s3c24xx/setup-i2c.c
  30. +1
    -0
      arch/arm/mach-s3c24xx/setup-sdhci-gpio.c
  31. +1
    -0
      arch/arm/mach-s3c24xx/setup-ts.c
  32. +1
    -0
      arch/arm/mach-s3c24xx/simtec-usb.c
  33. +3
    -0
      arch/arm/plat-samsung/pm-gpio.c
  34. +1
    -0
      arch/arm/plat-samsung/setup-camif.c
  35. +3
    -0
      drivers/gpio/gpio-samsung.c
  36. +1
    -0
      drivers/mmc/host/s3cmci.c
  37. +3
    -11
      include/linux/platform_data/gpio-samsung-s3c24xx.h

+ 1
- 2
arch/arm/Kconfig View File

@ -710,7 +710,6 @@ config ARCH_S3C24XX
select HAVE_S3C2410_WATCHDOG if WATCHDOG
select HAVE_S3C_RTC if RTC_CLASS
select MULTI_IRQ_HANDLER
select NEED_MACH_GPIO_H
select NEED_MACH_IO_H
select SAMSUNG_ATAGS
help
@ -1593,7 +1592,7 @@ config ARM_PSCI
config ARCH_NR_GPIO
int
default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || SOC_DRA7XX
default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || SOC_DRA7XX || ARCH_S3C24XX
default 392 if ARCH_U8500
default 352 if ARCH_VT8500
default 288 if ARCH_SUNXI


+ 0
- 21
arch/arm/mach-s3c24xx/Kconfig View File

@ -180,27 +180,6 @@ config CPU_LLSERIAL_S3C2440
Selected if there is an S3C2440 (or register compatible) serial
low-level implementation needed
# gpio configurations
config S3C24XX_GPIO_EXTRA
int
default 128 if S3C24XX_GPIO_EXTRA128
default 64 if S3C24XX_GPIO_EXTRA64
default 16 if ARCH_H1940
default 0
config S3C24XX_GPIO_EXTRA64
bool
help
Add an extra 64 gpio numbers to the available GPIO pool. This is
available for boards that need extra gpios for external devices.
config S3C24XX_GPIO_EXTRA128
bool
help
Add an extra 128 gpio numbers to the available GPIO pool. This is
available for boards that need extra gpios for external devices.
config S3C24XX_PLL
bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)"
depends on ARM_S3C24XX_CPUFREQ


+ 1
- 1
arch/arm/mach-s3c24xx/common-smdk.c View File

@ -38,7 +38,7 @@
#include <mach/regs-gpio.h>
#include <linux/platform_data/leds-s3c24xx.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <linux/platform_data/mtd-nand-s3c2410.h>
#include <plat/gpio-cfg.h>


+ 1
- 0
arch/arm/mach-s3c24xx/h1940-bluetooth.c View File

@ -18,6 +18,7 @@
#include <linux/leds.h>
#include <linux/gpio.h>
#include <linux/rfkill.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <mach/hardware.h>
#include <mach/regs-gpio.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-amlm5900.c View File

@ -54,6 +54,7 @@
#include <mach/regs-gpio.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <plat/devs.h>
#include <plat/cpu.h>
#include <plat/gpio-cfg.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-anubis.c View File

@ -37,6 +37,7 @@
#include <mach/regs-lcd.h>
#include <linux/platform_data/mtd-nand-s3c2410.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-at2440evb.c View File

@ -38,6 +38,7 @@
#include <mach/regs-lcd.h>
#include <linux/platform_data/mtd-nand-s3c2410.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-bast.c View File

@ -35,6 +35,7 @@
#include <linux/platform_data/hwmon-s3c.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <linux/platform_data/mtd-nand-s3c2410.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <net/ax88796.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-gta02.c View File

@ -70,6 +70,7 @@
#include <linux/platform_data/touchscreen-s3c2410.h>
#include <linux/platform_data/usb-ohci-s3c2410.h>
#include <linux/platform_data/usb-s3c2410_udc.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <mach/fb.h>
#include <mach/hardware.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-h1940.c View File

@ -46,6 +46,7 @@
#include <linux/platform_data/mmc-s3cmci.h>
#include <linux/platform_data/touchscreen-s3c2410.h>
#include <linux/platform_data/usb-s3c2410_udc.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <sound/uda1380.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-jive.c View File

@ -34,6 +34,7 @@
#include <plat/regs-serial.h>
#include <linux/platform_data/mtd-nand-s3c2410.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <mach/regs-gpio.h>
#include <mach/regs-lcd.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-mini2440.c View File

@ -46,6 +46,7 @@
#include <linux/platform_data/i2c-s3c2410.h>
#include <linux/platform_data/mmc-s3cmci.h>
#include <linux/platform_data/usb-s3c2410_udc.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-n30.c View File

@ -42,6 +42,7 @@
#include <asm/mach/map.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <plat/regs-serial.h>
#include <plat/clock.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-nexcoder.c View File

@ -39,6 +39,7 @@
#include <mach/regs-gpio.h>
#include <plat/regs-serial.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <plat/gpio-cfg.h>
#include <plat/clock.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-osiris.c View File

@ -33,6 +33,7 @@
#include <linux/platform_data/mtd-nand-s3c2410.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-qt2410.c View File

@ -54,6 +54,7 @@
#include <linux/platform_data/mtd-nand-s3c2410.h>
#include <linux/platform_data/usb-s3c2410_udc.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <plat/gpio-cfg.h>
#include <plat/devs.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-rx1950.c View File

@ -45,6 +45,7 @@
#include <linux/platform_data/mtd-nand-s3c2410.h>
#include <linux/platform_data/touchscreen-s3c2410.h>
#include <linux/platform_data/usb-s3c2410_udc.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <sound/uda1380.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-rx3715.c View File

@ -35,6 +35,7 @@
#include <asm/mach/map.h>
#include <linux/platform_data/mtd-nand-s3c2410.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <asm/irq.h>
#include <asm/mach-types.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-smdk2413.c View File

@ -39,6 +39,7 @@
#include <linux/platform_data/usb-s3c2410_udc.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <mach/fb.h>
#include <plat/clock.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-smdk2416.c View File

@ -41,6 +41,7 @@
#include <linux/platform_data/leds-s3c24xx.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <plat/gpio-cfg.h>
#include <plat/clock.h>


+ 1
- 0
arch/arm/mach-s3c24xx/mach-vr1000.c View File

@ -37,6 +37,7 @@
#include <linux/platform_data/leds-s3c24xx.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <linux/platform_data/asoc-s3c24xx_simtec.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <mach/hardware.h>
#include <mach/regs-gpio.h>


+ 1
- 0
arch/arm/mach-s3c24xx/pm-s3c2410.c View File

@ -28,6 +28,7 @@
#include <linux/syscore_ops.h>
#include <linux/gpio.h>
#include <linux/io.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <asm/mach-types.h>


+ 1
- 0
arch/arm/mach-s3c24xx/pm.c View File

@ -34,6 +34,7 @@
#include <linux/interrupt.h>
#include <linux/serial_core.h>
#include <linux/io.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <plat/regs-serial.h>
#include <mach/regs-clock.h>


+ 1
- 0
arch/arm/mach-s3c24xx/s3c2410.c View File

@ -24,6 +24,7 @@
#include <linux/platform_device.h>
#include <linux/reboot.h>
#include <linux/io.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>


+ 1
- 0
arch/arm/mach-s3c24xx/s3c2416.c View File

@ -36,6 +36,7 @@
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/reboot.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>


+ 1
- 0
arch/arm/mach-s3c24xx/s3c2440.c View File

@ -23,6 +23,7 @@
#include <linux/gpio.h>
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>


+ 1
- 0
arch/arm/mach-s3c24xx/s3c2442.c View File

@ -35,6 +35,7 @@
#include <linux/gpio.h>
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <mach/hardware.h>
#include <linux/atomic.h>


+ 1
- 0
arch/arm/mach-s3c24xx/s3c2443.c View File

@ -23,6 +23,7 @@
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/reboot.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>


+ 1
- 0
arch/arm/mach-s3c24xx/setup-i2c.c View File

@ -17,6 +17,7 @@ struct platform_device;
#include <plat/gpio-cfg.h>
#include <linux/platform_data/i2c-s3c2410.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <mach/hardware.h>
#include <mach/regs-gpio.h>


+ 1
- 0
arch/arm/mach-s3c24xx/setup-sdhci-gpio.c View File

@ -18,6 +18,7 @@
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/gpio.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <mach/regs-gpio.h>
#include <plat/gpio-cfg.h>


+ 1
- 0
arch/arm/mach-s3c24xx/setup-ts.c View File

@ -12,6 +12,7 @@
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
struct platform_device; /* don't need the contents */


+ 1
- 0
arch/arm/mach-s3c24xx/simtec-usb.c View File

@ -32,6 +32,7 @@
#include <asm/irq.h>
#include <linux/platform_data/usb-ohci-s3c2410.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <plat/devs.h>
#include "bast.h"


+ 3
- 0
arch/arm/plat-samsung/pm-gpio.c View File

@ -19,6 +19,9 @@
#include <linux/io.h>
#include <linux/gpio.h>
#ifdef CONFIG_ARCH_S3C24XX
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#endif
#include <plat/gpio-core.h>
#include <plat/pm.h>


+ 1
- 0
arch/arm/plat-samsung/setup-camif.c View File

@ -9,6 +9,7 @@
*/
#include <linux/gpio.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include <plat/gpio-cfg.h>
/* Number of camera port pins, without FIELD */


+ 3
- 0
drivers/gpio/gpio-samsung.c View File

@ -27,6 +27,9 @@
#include <linux/of.h>
#include <linux/slab.h>
#include <linux/of_address.h>
#ifdef CONFIG_ARCH_S3C24XX
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#endif
#include <asm/irq.h>


+ 1
- 0
drivers/mmc/host/s3cmci.c View File

@ -26,6 +26,7 @@
#include <mach/dma.h>
#include <linux/platform_data/mmc-s3cmci.h>
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
#include "s3cmci.h"


arch/arm/mach-s3c24xx/include/mach/gpio.h → include/linux/platform_data/gpio-samsung-s3c24xx.h View File

@ -14,16 +14,8 @@
* devices that need GPIO.
*/
#ifndef __MACH_GPIO_H
#define __MACH_GPIO_H __FILE__
#ifdef CONFIG_CPU_S3C244X
#define ARCH_NR_GPIOS (32 * 9 + CONFIG_S3C24XX_GPIO_EXTRA)
#elif defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2416)
#define ARCH_NR_GPIOS (32 * 12 + CONFIG_S3C24XX_GPIO_EXTRA)
#else
#define ARCH_NR_GPIOS (256 + CONFIG_S3C24XX_GPIO_EXTRA)
#endif
#ifndef GPIO_SAMSUNG_S3C24XX_H
#define GPIO_SAMSUNG_S3C24XX_H
/*
* GPIO sizes for various SoCs:
@ -111,4 +103,4 @@ enum s3c_gpio_number {
#define S3C_GPIO_END (S3C2410_GPH(0) + 32)
#endif
#endif /* __MACH_GPIO_H */
#endif /* GPIO_SAMSUNG_S3C24XX_H */

Loading…
Cancel
Save