ARM: s3c24xx: get rid of custom <mach/gpio.h>
Subsystems (5)
PATCH 1/1 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.
---
If one of the maintainers give me an ACK for this I will take it through the GPIO tree.
--- arch/arm/Kconfig | 3 +- arch/arm/mach-s3c24xx/Kconfig | 21 ---- arch/arm/mach-s3c24xx/common-smdk.c | 2 +- arch/arm/mach-s3c24xx/h1940-bluetooth.c | 1 + arch/arm/mach-s3c24xx/include/mach/gpio.h | 114 --------------------- arch/arm/mach-s3c24xx/mach-amlm5900.c | 1 + arch/arm/mach-s3c24xx/mach-anubis.c | 1 + arch/arm/mach-s3c24xx/mach-at2440evb.c | 1 + arch/arm/mach-s3c24xx/mach-bast.c | 1 + arch/arm/mach-s3c24xx/mach-gta02.c | 1 + arch/arm/mach-s3c24xx/mach-h1940.c | 1 + arch/arm/mach-s3c24xx/mach-jive.c | 1 + arch/arm/mach-s3c24xx/mach-mini2440.c | 1 + arch/arm/mach-s3c24xx/mach-n30.c | 1 + arch/arm/mach-s3c24xx/mach-nexcoder.c | 1 + arch/arm/mach-s3c24xx/mach-osiris.c | 1 + arch/arm/mach-s3c24xx/mach-qt2410.c | 1 + arch/arm/mach-s3c24xx/mach-rx1950.c | 1 + arch/arm/mach-s3c24xx/mach-rx3715.c | 1 + arch/arm/mach-s3c24xx/mach-smdk2413.c | 1 + arch/arm/mach-s3c24xx/mach-smdk2416.c | 1 + arch/arm/mach-s3c24xx/mach-vr1000.c | 1 + arch/arm/mach-s3c24xx/pm-s3c2410.c | 1 + arch/arm/mach-s3c24xx/pm.c | 1 + arch/arm/mach-s3c24xx/s3c2410.c | 1 + arch/arm/mach-s3c24xx/s3c2416.c | 1 + arch/arm/mach-s3c24xx/s3c2440.c | 1 + arch/arm/mach-s3c24xx/s3c2442.c | 1 + arch/arm/mach-s3c24xx/s3c2443.c | 1 + arch/arm/mach-s3c24xx/setup-i2c.c | 1 + arch/arm/mach-s3c24xx/setup-sdhci-gpio.c | 1 + arch/arm/mach-s3c24xx/setup-ts.c | 1 + arch/arm/mach-s3c24xx/simtec-usb.c | 1 + arch/arm/plat-samsung/pm-gpio.c | 1 + arch/arm/plat-samsung/setup-camif.c | 1 + drivers/gpio/gpio-samsung.c | 1 + drivers/mmc/host/s3cmci.c | 1 + include/linux/platform_data/gpio-samsung-s3c24xx.h | 106 +++++++++++++++++++ 38 files changed, 141 insertions(+), 138 deletions(-) delete mode 100644 arch/arm/mach-s3c24xx/include/mach/gpio.h create mode 100644 include/linux/platform_data/gpio-samsung-s3c24xx.h
arch/arm/Kconfig +1 -2
@@ -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
arch/arm/mach-s3c24xx/Kconfig +0 -21
@@ -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
arch/arm/mach-s3c24xx/common-smdk.c +1 -1
@@ -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>
arch/arm/mach-s3c24xx/h1940-bluetooth.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/include/mach/gpio.h deleted +0 -114
114 lines not on this page · raw message
arch/arm/mach-s3c24xx/mach-amlm5900.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-anubis.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-at2440evb.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-bast.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-gta02.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-h1940.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-jive.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-mini2440.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-n30.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-nexcoder.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-osiris.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-qt2410.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-rx1950.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-rx3715.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-smdk2413.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-smdk2416.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/mach-vr1000.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/pm-s3c2410.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/pm.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/s3c2410.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/s3c2416.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/s3c2440.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/s3c2442.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/s3c2443.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/setup-i2c.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/setup-sdhci-gpio.c +1 -0
@@ -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>
arch/arm/mach-s3c24xx/setup-ts.c +1 -0
@@ -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 */
arch/arm/mach-s3c24xx/simtec-usb.c +1 -0
@@ -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"
arch/arm/plat-samsung/pm-gpio.c +1 -0
@@ -19,6 +19,7 @@#include <linux/io.h> #include <linux/gpio.h> +#include <linux/platform_data/gpio-samsung-s3c24xx.h> #include <plat/gpio-core.h> #include <plat/pm.h>
arch/arm/plat-samsung/setup-camif.c +1 -0
@@ -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 */
drivers/gpio/gpio-samsung.c +1 -0
@@ -27,6 +27,7 @@#include <linux/of.h> #include <linux/slab.h> #include <linux/of_address.h> +#include <linux/platform_data/gpio-samsung-s3c24xx.h> #include <asm/irq.h>
drivers/mmc/host/s3cmci.c +1 -0
@@ -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"
include/linux/platform_data/gpio-samsung-s3c24xx.h new file +106 -0
106 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 1/1 ARM: s3c24xx: get rid of custom <mach/gpio.h>
Quoted 2 lines · Linus Walleij
This isolates the custom S3C24xx GPIO definition table to <
linux/platform_data/gpio-samsung-s3x24xx.h>
Maybe I'm too trigger happy. I'll send a combined series with S3C24xx, S3C64xx and maybe also S5P variants all fixed so you can see the overall idea here. Hold on.
Yours,
Linus Walleij
PATCH 1/1 ARM: s3c24xx: get rid of custom <mach/gpio.h>
Quoted 2 lines · Linus Walleij
On Fri, Dec 6, 2013 at 10:31 AM, Linus Walleij<[email protected]> wrote:
Hi Linus,
Quoted 7 lines
Quoted 2 lines
This isolates the custom S3C24xx GPIO definition table to <
linux/platform_data/gpio-samsung-s3x24xx.h>Maybe I'm too trigger happy. I'll send a combined series with S3C24xx, S3C64xx and maybe also S5P variants all fixed so you can see the overall idea here. Hold on.
Basically, looks good to me and let me hold on look at this patch? as you requested ;-)
Anyway, thanks for your care of samsung gpio stuff.
- Kukjin