ARM: S3C[24|64]xx: move includes back under <mach/> scope

PATCH New Linus Walleij 5 participants 9 messages Jan 14, 2014 – Jan 15, 2014

Subsystems (5)

Arm (32-bit) Arm sub-architectures GPIO Arm Samsung Exynos +1 more subsystems

lore

Share & tools

lore

Linus Walleij

author

2014-01-14 13:53 UTC #0 lore raw

PATCH 1/1 ARM: S3C[24|64]xx: move includes back under <mach/> scope

When refactoring and breaking out the includes for the machine-specific GPIO configuration, two files were created in <linux/platform_data/gpio-samsung-s3c[24|64]xx.h>, but as that namespace shall be used for defining data exchanged between machines and drivers, using it for these broad macros and config settings is wrong.

Move the headers back into the machine-local <mach/gpio-samsung.h> file and think about the next step.

Reported-by Arnd Bergmann <[email protected]>

Cc Tomasz Figa <[email protected]>

Cc Sylwester Nawrocki <[email protected]>

Cc Ben Dooks <[email protected]>

Cc Kukjin Kim <[email protected]>

Cc Heiko Stuebner <[email protected]>

Cc Mark Brown <[email protected]>

Cc linux-samsung-soc at vger.kernel.org

Signed-off-by Linus Walleij <[email protected]>

---
Maintainers (Kukjin especially) - it'd be nice with a speedy ACK if this looks OK. I will put it into linux-next immediately so things are in order and smoketested for the merge window.

---
 arch/arm/mach-s3c24xx/common-smdk.c                |   2 +-
 arch/arm/mach-s3c24xx/h1940-bluetooth.c            |   2 +-
 arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h  | 106 +++++++++++++++++++++
 arch/arm/mach-s3c24xx/mach-amlm5900.c              |   2 +-
 arch/arm/mach-s3c24xx/mach-anubis.c                |   2 +-
 arch/arm/mach-s3c24xx/mach-at2440evb.c             |   2 +-
 arch/arm/mach-s3c24xx/mach-bast.c                  |   2 +-
 arch/arm/mach-s3c24xx/mach-gta02.c                 |   2 +-
 arch/arm/mach-s3c24xx/mach-h1940.c                 |   2 +-
 arch/arm/mach-s3c24xx/mach-jive.c                  |   2 +-
 arch/arm/mach-s3c24xx/mach-mini2440.c              |   2 +-
 arch/arm/mach-s3c24xx/mach-n30.c                   |   2 +-
 arch/arm/mach-s3c24xx/mach-nexcoder.c              |   2 +-
 arch/arm/mach-s3c24xx/mach-osiris-dvs.c            |   2 +-
 arch/arm/mach-s3c24xx/mach-osiris.c                |   2 +-
 arch/arm/mach-s3c24xx/mach-qt2410.c                |   2 +-
 arch/arm/mach-s3c24xx/mach-rx1950.c                |   2 +-
 arch/arm/mach-s3c24xx/mach-rx3715.c                |   2 +-
 arch/arm/mach-s3c24xx/mach-smdk2413.c              |   2 +-
 arch/arm/mach-s3c24xx/mach-smdk2416.c              |   2 +-
 arch/arm/mach-s3c24xx/mach-vr1000.c                |   2 +-
 arch/arm/mach-s3c24xx/pm-s3c2410.c                 |   2 +-
 arch/arm/mach-s3c24xx/pm.c                         |   2 +-
 arch/arm/mach-s3c24xx/s3c2410.c                    |   2 +-
 arch/arm/mach-s3c24xx/s3c2416.c                    |   2 +-
 arch/arm/mach-s3c24xx/s3c2440.c                    |   2 +-
 arch/arm/mach-s3c24xx/s3c2442.c                    |   2 +-
 arch/arm/mach-s3c24xx/s3c2443.c                    |   2 +-
 arch/arm/mach-s3c24xx/setup-i2c.c                  |   2 +-
 arch/arm/mach-s3c24xx/setup-sdhci-gpio.c           |   2 +-
 arch/arm/mach-s3c24xx/setup-ts.c                   |   2 +-
 arch/arm/mach-s3c24xx/simtec-usb.c                 |   2 +-
 arch/arm/mach-s3c64xx/common.c                     |   2 +-
 arch/arm/mach-s3c64xx/crag6410.h                   |   2 +-
 arch/arm/mach-s3c64xx/dev-audio.c                  |   2 +-
 arch/arm/mach-s3c64xx/include/mach/gpio-samsung.h  |  94 ++++++++++++++++++
 arch/arm/mach-s3c64xx/mach-anw6410.c               |   2 +-
 arch/arm/mach-s3c64xx/mach-crag6410.c              |   3 +-
 arch/arm/mach-s3c64xx/mach-hmt.c                   |   2 +-
 arch/arm/mach-s3c64xx/mach-mini6410.c              |   2 +-
 arch/arm/mach-s3c64xx/mach-real6410.c              |   2 +-
 arch/arm/mach-s3c64xx/mach-smartq.c                |   2 +-
 arch/arm/mach-s3c64xx/mach-smartq5.c               |   2 +-
 arch/arm/mach-s3c64xx/mach-smartq7.c               |   2 +-
 arch/arm/mach-s3c64xx/mach-smdk6400.c              |   2 +-
 arch/arm/mach-s3c64xx/mach-smdk6410.c              |   2 +-
 arch/arm/mach-s3c64xx/pm.c                         |   2 +-
 arch/arm/mach-s3c64xx/setup-fb-24bpp.c             |   2 +-
 arch/arm/mach-s3c64xx/setup-i2c0.c                 |   2 +-
 arch/arm/mach-s3c64xx/setup-i2c1.c                 |   2 +-
 arch/arm/mach-s3c64xx/setup-ide.c                  |   2 +-
 arch/arm/mach-s3c64xx/setup-keypad.c               |   2 +-
 arch/arm/mach-s3c64xx/setup-sdhci-gpio.c           |   2 +-
 arch/arm/mach-s3c64xx/setup-spi.c                  |   2 +-
 arch/arm/plat-samsung/pm-gpio.c                    |   7 +-
 arch/arm/plat-samsung/setup-camif.c                |   2 +-
 drivers/gpio/gpio-samsung.c                        |   7 +-
 drivers/mmc/host/s3cmci.c                          |   2 +-
 include/linux/platform_data/gpio-samsung-s3c24xx.h | 106 ---------------------
 include/linux/platform_data/gpio-samsung-s3c64xx.h |  94 ------------------
 60 files changed, 256 insertions(+), 267 deletions(-)
 create mode 100644 arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h
 create mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-samsung.h
 delete mode 100644 include/linux/platform_data/gpio-samsung-s3c24xx.h
 delete mode 100644 include/linux/platform_data/gpio-samsung-s3c64xx.h

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

index 0a84a9c9f429..e9fbcc91c5c0 100644
@@ -37,8 +37,8 @@
 #include <asm/irq.h>
 
 #include <mach/regs-gpio.h>
+#include <mach/gpio-samsung.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 -1

index f2b859f4c894..ff3afc163178 100644
@@ -18,10 +18,10 @@
 #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>
+#include <mach/gpio-samsung.h>
 
 #include "h1940.h"

arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h new file +106 -0

106 lines not on this page · raw message

arch/arm/mach-s3c24xx/mach-amlm5900.c +1 -1

index 530e9a624466..284ea1f44205 100644
@@ -52,9 +52,9 @@
 #include <plat/regs-serial.h>
 #include <mach/regs-lcd.h>
 #include <mach/regs-gpio.h>
+#include <mach/gpio-samsung.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 -1

index b60a248c033a..2a16f8fb3584 100644
@@ -35,9 +35,9 @@
 #include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
+#include <mach/gpio-samsung.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 -1

index 74401196b429..6beab674c147 100644
@@ -36,9 +36,9 @@
 #include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
+#include <mach/gpio-samsung.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 -1

index 47fe7af87129..981ba1eb9fdc 100644
@@ -35,7 +35,6 @@
 #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>

@@ -49,6 +48,7 @@
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
+#include <mach/gpio-samsung.h>
 
 #include <plat/clock.h>
 #include <plat/cpu.h>

arch/arm/mach-s3c24xx/mach-gta02.c +1 -1

index c2c2ac78cea8..d9170e9f8ccd 100644
@@ -70,12 +70,12 @@
 #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>
 #include <mach/regs-gpio.h>
 #include <mach/regs-irq.h>
+#include <mach/gpio-samsung.h>
 
 #include <plat/cpu.h>
 #include <plat/devs.h>

arch/arm/mach-s3c24xx/mach-h1940.c +1 -1

index d25d8b18512c..de0832181d8c 100644
@@ -46,7 +46,6 @@
 #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>

@@ -55,6 +54,7 @@
 #include <mach/regs-clock.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
+#include <mach/gpio-samsung.h>
 
 #include <plat/clock.h>
 #include <plat/cpu.h>

arch/arm/mach-s3c24xx/mach-jive.c +1 -1

index 434dbf231773..67cb8e948b7e 100644
@@ -34,11 +34,11 @@
 #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>
 #include <mach/fb.h>
+#include <mach/gpio-samsung.h>
 
 #include <asm/mach-types.h>

arch/arm/mach-s3c24xx/mach-mini2440.c +1 -1

index 48af11fc15fd..1f1559713d8b 100644
@@ -42,11 +42,11 @@
 #include <linux/platform_data/leds-s3c24xx.h>
 #include <mach/regs-lcd.h>
 #include <mach/irqs.h>
+#include <mach/gpio-samsung.h>
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 #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 -1

index 7fcb887f5289..997684f17930 100644
@@ -36,13 +36,13 @@
 #include <linux/platform_data/leds-s3c24xx.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
+#include <mach/gpio-samsung.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/irq.h>
 #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 -1

index 0f27ac44db09..575d28c9e6c6 100644
@@ -37,9 +37,9 @@
 
 //#include <asm/debug-ll.h>
 #include <mach/regs-gpio.h>
+#include <mach/gpio-samsung.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-dvs.c +1 -1

index 5b8af46c0d6b..33afb9190091 100644
@@ -16,11 +16,11 @@
 #include <linux/platform_device.h>
 #include <linux/cpufreq.h>
 #include <linux/gpio.h>
-#include <linux/platform_data/gpio-samsung-s3c24xx.h>
 
 #include <linux/i2c/tps65010.h>
 
 #include <plat/cpu-freq.h>
+#include <mach/gpio-samsung.h>
 
 #define OSIRIS_GPIO_DVS	S3C2410_GPB(5)

arch/arm/mach-s3c24xx/mach-osiris.c +1 -1

index 040b16aff93d..f84f2a4c0c6d 100644
@@ -33,7 +33,6 @@
 
 #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>

@@ -51,6 +50,7 @@
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
+#include <mach/gpio-samsung.h>
 
 #include "common.h"
 #include "osiris.h"

arch/arm/mach-s3c24xx/mach-qt2410.c +1 -1

index 96c3bc858710..b534b76812e3 100644
@@ -54,7 +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 <mach/gpio-samsung.h>
 
 #include <plat/gpio-cfg.h>
 #include <plat/devs.h>

arch/arm/mach-s3c24xx/mach-rx1950.c +1 -1

index d492fb938bbb..345d01aa3524 100644
@@ -45,13 +45,13 @@
 #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>
 
 #include <mach/fb.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
+#include <mach/gpio-samsung.h>
 
 #include <plat/clock.h>
 #include <plat/cpu.h>

arch/arm/mach-s3c24xx/mach-rx3715.c +1 -1

index 319ed8033475..b36edce8b2b8 100644
@@ -35,7 +35,6 @@
 #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>

@@ -44,6 +43,7 @@
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
+#include <mach/gpio-samsung.h>
 
 #include <plat/clock.h>
 #include <plat/cpu.h>

arch/arm/mach-s3c24xx/mach-smdk2413.c +1 -1

index 86e25012b0c1..f5bc721217e3 100644
@@ -39,7 +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/gpio-samsung.h>
 #include <mach/fb.h>
 
 #include <plat/clock.h>

arch/arm/mach-s3c24xx/mach-smdk2416.c +1 -1

index 0cc691d01d60..12023cae4378 100644
@@ -38,10 +38,10 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
 #include <mach/regs-s3c2443-clock.h>
+#include <mach/gpio-samsung.h>
 
 #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 -1

index 86e7ffdca33f..755df489a45f 100644
@@ -37,10 +37,10 @@
 #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>
+#include <mach/gpio-samsung.h>
 
 #include <plat/clock.h>
 #include <plat/cpu.h>

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

index e4cd56e8b90b..509b20b4ab3b 100644
@@ -28,12 +28,12 @@
 #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>
 
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
+#include <mach/gpio-samsung.h>
 
 #include <plat/cpu.h>
 #include <plat/pm.h>

arch/arm/mach-s3c24xx/pm.c +1 -1

index 2baa887b28d2..052ca23393a7 100644
@@ -34,12 +34,12 @@
 #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>
 #include <mach/regs-gpio.h>
 #include <mach/regs-irq.h>
+#include <mach/gpio-samsung.h>
 
 #include <asm/mach/time.h>

arch/arm/mach-s3c24xx/s3c2410.c +1 -1

index db22f748ce8d..ffb92cbca08c 100644
@@ -24,13 +24,13 @@
 #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>
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
+#include <mach/gpio-samsung.h>
 #include <asm/irq.h>
 #include <asm/system_misc.h>

arch/arm/mach-s3c24xx/s3c2416.c +1 -1

index cb77880029f7..8e01b4f2df35 100644
@@ -36,13 +36,13 @@
 #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>
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
+#include <mach/gpio-samsung.h>
 #include <asm/proc-fns.h>
 #include <asm/irq.h>
 #include <asm/system_misc.h>

arch/arm/mach-s3c24xx/s3c2440.c +1 -1

index 22e5dbdcbe8d..03d379f1fc52 100644
@@ -23,13 +23,13 @@
 #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>
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
+#include <mach/gpio-samsung.h>
 #include <asm/irq.h>
 
 #include <plat/devs.h>

arch/arm/mach-s3c24xx/s3c2442.c +1 -1

index 4ba093b4e495..2c8adc028538 100644
@@ -35,9 +35,9 @@
 #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 <mach/gpio-samsung.h>
 #include <linux/atomic.h>
 #include <asm/irq.h>

arch/arm/mach-s3c24xx/s3c2443.c +1 -1

index faa1086924c4..886c2147062b 100644
@@ -23,13 +23,13 @@
 #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>
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
+#include <mach/gpio-samsung.h>
 #include <asm/irq.h>
 #include <asm/system_misc.h>

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

index 3d1fd5ce24e5..1852696ca16e 100644
@@ -17,9 +17,9 @@ 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>
+#include <mach/gpio-samsung.h>
 
 void s3c_i2c0_cfg_gpio(struct platform_device *dev)
 {

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

index 2835241f732a..c99b0f664db7 100644
@@ -18,9 +18,9 @@
 #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 <mach/gpio-samsung.h>
 #include <plat/gpio-cfg.h>
 
 void s3c2416_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)

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

index 1ea4056f6fdc..f61f02bdc52f 100644
@@ -12,11 +12,11 @@
 
 #include <linux/kernel.h>
 #include <linux/gpio.h>
-#include <linux/platform_data/gpio-samsung-s3c24xx.h>
 
 struct platform_device; /* don't need the contents */
 
 #include <mach/hardware.h>
+#include <mach/gpio-samsung.h>
 
 /**
  * s3c24xx_ts_cfg_gpio - configure gpio for s3c2410 systems

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

index a007e5f16583..8dea917e954b 100644
@@ -29,10 +29,10 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
+#include <mach/gpio-samsung.h>
 #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/mach-s3c64xx/common.c +1 -1

index 64edda37bde3..76ab595d849b 100644
@@ -32,7 +32,6 @@
 #include <linux/irq.h>
 #include <linux/gpio.h>
 #include <linux/irqchip/arm-vic.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 #include <clocksource/samsung_pwm.h>
 
 #include <asm/mach/arch.h>

@@ -42,6 +41,7 @@
 #include <mach/map.h>
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
+#include <mach/gpio-samsung.h>
 
 #include <plat/cpu.h>
 #include <plat/devs.h>

arch/arm/mach-s3c64xx/crag6410.h +1 -1

index 9ef20b8fd36f..7bc66682687e 100644
@@ -11,7 +11,7 @@
 #ifndef MACH_CRAG6410_H
 #define MACH_CRAG6410_H
 
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
+#include <mach/gpio-samsung.h>
 
 #define GLENFARCLAS_PMIC_IRQ_BASE	IRQ_BOARD_START

arch/arm/mach-s3c64xx/dev-audio.c +1 -1

index 6f58c80235dc..ff780a8d8366 100644
@@ -21,8 +21,8 @@
 
 #include <plat/devs.h>
 #include <linux/platform_data/asoc-s3c.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 #include <plat/gpio-cfg.h>
+#include <mach/gpio-samsung.h>
 
 static int s3c64xx_i2s_cfg_gpio(struct platform_device *pdev)
 {

arch/arm/mach-s3c64xx/include/mach/gpio-samsung.h new file +94 -0

94 lines not on this page · raw message

arch/arm/mach-s3c64xx/mach-anw6410.c +1 -1

index 546f45b59ea1..ddeb0e51a962 100644
@@ -43,13 +43,13 @@
 
 #include <plat/regs-serial.h>
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 #include <plat/fb.h>
 
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <mach/regs-gpio.h>
+#include <mach/gpio-samsung.h>
 #include <plat/samsung-time.h>
 
 #include "common.h"

arch/arm/mach-s3c64xx/mach-crag6410.c +1 -2

index 7b913595e4ee..3df3c372ee1f 100644
@@ -32,7 +32,6 @@
 
 #include <linux/platform_data/pca953x.h>
 #include <linux/platform_data/s3c-hsotg.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 
 #include <video/platform_lcd.h>

@@ -49,8 +48,8 @@
 #include <video/samsung_fimd.h>
 #include <mach/hardware.h>
 #include <mach/map.h>
-
 #include <mach/regs-gpio.h>
+#include <mach/gpio-samsung.h>
 
 #include <plat/regs-serial.h>
 #include <plat/fb.h>

arch/arm/mach-s3c64xx/mach-hmt.c +1 -1

index 009b19525cbf..0431016925b9 100644
@@ -35,7 +35,7 @@
 
 #include <plat/regs-serial.h>
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
+#include <mach/gpio-samsung.h>
 #include <plat/fb.h>
 #include <linux/platform_data/mtd-nand-s3c2410.h>

arch/arm/mach-s3c64xx/mach-mini6410.c +1 -1

index 14c96ee5a3fe..8c84d3448dac 100644
@@ -30,6 +30,7 @@
 
 #include <mach/map.h>
 #include <mach/regs-gpio.h>
+#include <mach/gpio-samsung.h>
 
 #include <plat/adc.h>
 #include <plat/cpu.h>

@@ -38,7 +39,6 @@
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/regs-serial.h>
 #include <linux/platform_data/touchscreen-s3c2410.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 
 #include <video/platform_lcd.h>
 #include <video/samsung_fimd.h>

arch/arm/mach-s3c64xx/mach-real6410.c +1 -1

index af45149a96b3..5152026f0e19 100644
@@ -31,6 +31,7 @@
 
 #include <mach/map.h>
 #include <mach/regs-gpio.h>
+#include <mach/gpio-samsung.h>
 
 #include <plat/adc.h>
 #include <plat/cpu.h>

@@ -39,7 +40,6 @@
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/regs-serial.h>
 #include <linux/platform_data/touchscreen-s3c2410.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 
 #include <video/platform_lcd.h>
 #include <video/samsung_fimd.h>

arch/arm/mach-s3c64xx/mach-smartq.c +1 -1

index 0271b3a191e5..5629df905fcd 100644
@@ -25,6 +25,7 @@
 
 #include <mach/map.h>
 #include <mach/regs-gpio.h>
+#include <mach/gpio-samsung.h>
 
 #include <plat/clock.h>
 #include <plat/cpu.h>

@@ -36,7 +37,6 @@
 #include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <plat/sdhci.h>
 #include <linux/platform_data/touchscreen-s3c2410.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 
 #include <video/platform_lcd.h>
 #include <plat/samsung-time.h>

arch/arm/mach-s3c64xx/mach-smartq5.c +1 -1

index 15b6c2f98086..dec4c08e834f 100644
@@ -16,7 +16,6 @@
 #include <linux/input.h>
 #include <linux/leds.h>
 #include <linux/platform_device.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>

@@ -24,6 +23,7 @@
 #include <video/samsung_fimd.h>
 #include <mach/map.h>
 #include <mach/regs-gpio.h>
+#include <mach/gpio-samsung.h>
 
 #include <plat/cpu.h>
 #include <plat/devs.h>

arch/arm/mach-s3c64xx/mach-smartq7.c +1 -1

index e3b58942ee68..27b322069c7d 100644
@@ -16,7 +16,6 @@
 #include <linux/input.h>
 #include <linux/leds.h>
 #include <linux/platform_device.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>

@@ -24,6 +23,7 @@
 #include <video/samsung_fimd.h>
 #include <mach/map.h>
 #include <mach/regs-gpio.h>
+#include <mach/gpio-samsung.h>
 
 #include <plat/cpu.h>
 #include <plat/devs.h>

arch/arm/mach-s3c64xx/mach-smdk6400.c +1 -1

index bdbbddb803d5..150f55fb9e33 100644
@@ -35,7 +35,7 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
+#include <mach/gpio-samsung.h>
 #include <plat/samsung-time.h>
 
 #include "common.h"

arch/arm/mach-s3c64xx/mach-smdk6410.c +1 -1

index a8977da87eb1..43261d24a0a5 100644
@@ -31,7 +31,6 @@
 #include <linux/regulator/machine.h>
 #include <linux/pwm_backlight.h>
 #include <linux/platform_data/s3c-hsotg.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 
 #ifdef CONFIG_SMDK6410_WM1190_EV1
 #include <linux/mfd/wm8350/core.h>

@@ -58,6 +57,7 @@
 
 #include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
+#include <mach/gpio-samsung.h>
 #include <linux/platform_data/ata-samsung_cf.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>

arch/arm/mach-s3c64xx/pm.c +1 -1

index 99c778eecab6..b5a66986a529 100644
@@ -18,7 +18,6 @@
 #include <linux/io.h>
 #include <linux/gpio.h>
 #include <linux/pm_domain.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 
 #include <mach/map.h>
 #include <mach/irqs.h>

@@ -29,6 +28,7 @@
 
 #include <mach/regs-gpio.h>
 #include <mach/regs-clock.h>
+#include <mach/gpio-samsung.h>
 
 #include "regs-gpio-memport.h"
 #include "regs-modem.h"

arch/arm/mach-s3c64xx/setup-fb-24bpp.c +1 -1

index 222792691b41..9d17bff12d4d 100644
@@ -16,10 +16,10 @@
 #include <linux/types.h>
 #include <linux/fb.h>
 #include <linux/gpio.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 
 #include <plat/fb.h>
 #include <plat/gpio-cfg.h>
+#include <mach/gpio-samsung.h>
 
 void s3c64xx_fb_gpio_setup_24bpp(void)
 {

arch/arm/mach-s3c64xx/setup-i2c0.c +1 -1

index f269dabc9593..4b8c1cfdd1fc 100644
@@ -19,8 +19,8 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 #include <plat/gpio-cfg.h>
+#include <mach/gpio-samsung.h>
 
 void s3c_i2c0_cfg_gpio(struct platform_device *dev)
 {

arch/arm/mach-s3c64xx/setup-i2c1.c +1 -1

index aa2bfcd5e818..cd1df71ee13b 100644
@@ -19,8 +19,8 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 #include <plat/gpio-cfg.h>
+#include <mach/gpio-samsung.h>
 
 void s3c_i2c1_cfg_gpio(struct platform_device *dev)
 {

arch/arm/mach-s3c64xx/setup-ide.c +1 -1

index 81dcebeaeb53..689fb72e715c 100644
@@ -17,8 +17,8 @@
 #include <mach/map.h>
 #include <mach/regs-clock.h>
 #include <plat/gpio-cfg.h>
+#include <mach/gpio-samsung.h>
 #include <linux/platform_data/ata-samsung_cf.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 
 void s3c64xx_ide_setup_gpio(void)
 {

arch/arm/mach-s3c64xx/setup-keypad.c +1 -1

index e236f40c9053..6ad9a89dfddf 100644
@@ -11,9 +11,9 @@
 */
 
 #include <linux/gpio.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 #include <plat/gpio-cfg.h>
 #include <plat/keypad.h>
+#include <mach/gpio-samsung.h>
 
 void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
 {

arch/arm/mach-s3c64xx/setup-sdhci-gpio.c +1 -1

index 79192b7217df..f426b7a16c16 100644
@@ -17,10 +17,10 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 
 #include <plat/gpio-cfg.h>
 #include <plat/sdhci.h>
+#include <mach/gpio-samsung.h>
 
 void s3c64xx_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
 {

arch/arm/mach-s3c64xx/setup-spi.c +1 -1

index dad4728ccb52..5fd1a315c901 100644
@@ -9,8 +9,8 @@
  */
 
 #include <linux/gpio.h>
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
 #include <plat/gpio-cfg.h>
+#include <mach/gpio-samsung.h>
 
 #ifdef CONFIG_S3C64XX_DEV_SPI0
 int s3c64xx_spi0_cfg_gpio(void)

arch/arm/plat-samsung/pm-gpio.c +1 -6

index c4efa1c2a5d1..a9f7a37c4173 100644
@@ -19,12 +19,7 @@
 #include <linux/io.h>
 #include <linux/gpio.h>
 
-#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 <mach/gpio-samsung.h>
 #include <plat/gpio-core.h>
 #include <plat/pm.h>

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

index 70cf503c9a6b..72d8edb8927a 100644
@@ -9,8 +9,8 @@
  */
 
 #include <linux/gpio.h>
-#include <linux/platform_data/gpio-samsung-s3c24xx.h>
 #include <plat/gpio-cfg.h>
+#include <mach/gpio-samsung.h>
 
 /* Number of camera port pins, without FIELD */
 #define S3C_CAMIF_NUM_GPIOS	13

drivers/gpio/gpio-samsung.c +1 -6

index 990754b97f2e..9741cce11df5 100644
@@ -27,17 +27,12 @@
 #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
-#ifdef CONFIG_ARCH_S3C64XX
-#include <linux/platform_data/gpio-samsung-s3c64xx.h>
-#endif
 
 #include <asm/irq.h>
 
 #include <mach/map.h>
 #include <mach/regs-gpio.h>
+#include <mach/gpio-samsung.h>
 
 #include <plat/cpu.h>
 #include <plat/gpio-core.h>

drivers/mmc/host/s3cmci.c +1 -1

index 11ba3cbb0951..e34d499cb316 100644
@@ -24,9 +24,9 @@
 #include <linux/io.h>
 
 #include <mach/dma.h>
+#include <mach/gpio-samsung.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 deleted +0 ~~-106~~

106 lines not on this page · raw message

include/linux/platform_data/gpio-samsung-s3c64xx.h deleted +0 ~~-94~~

94 lines not on this page · raw message

Signature · 1 line

1.8.4.2

Mark Brown

2014-01-14 14:10 UTC #1 lore raw

PATCH 1/1 ARM: S3C[24|64]xx: move includes back under <mach/> scope

Quoted 6 lines · Linus Walleij

When refactoring and breaking out the includes for the machine-specific GPIO configuration, two files were created in <linux/platform_data/gpio-samsung-s3c[24|64]xx.h>, but as that namespace shall be used for defining data exchanged between machines and drivers, using it for these broad macros and config settings is wrong.

Acked-by Mark Brown <[email protected]>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140114/cb346089/attachment.sig>

Arnd Bergmann

2014-01-14 14:11 UTC #2 lore raw

PATCH 1/1 ARM: S3C[24|64]xx: move includes back under <mach/> scope

In reply to Linus Walleij

Quoted 10 lines · On Tuesday 14 January 2014 14:53:38 Linus Walleij wrote:

When refactoring and breaking out the includes for the machine-specific GPIO configuration, two files were created in <linux/platform_data/gpio-samsung-s3c[24|64]xx.h>, but as that namespace shall be used for defining data exchanged between machines and drivers, using it for these broad macros and config settings is wrong.
Move the headers back into the machine-local <mach/gpio-samsung.h> file and think about the next step.

Quoted 9 lines

Reported-by Arnd Bergmann <[email protected]>
Cc Tomasz Figa <[email protected]>
Cc Sylwester Nawrocki <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc Heiko Stuebner <[email protected]>
Cc Mark Brown <[email protected]>
Cc linux-samsung-soc at vger.kernel.org
Signed-off-by Linus Walleij <[email protected]>

Acked-by Arnd Bergmann <[email protected]>

Heiko Stübner

2014-01-14 14:19 UTC #3 lore raw

PATCH 1/1 ARM: S3C[24|64]xx: move includes back under <mach/> scope

In reply to Linus Walleij

Am Dienstag, 14. Januar 2014, 14:53:38 schrieb Linus Walleij:

Quoted 19 lines

When refactoring and breaking out the includes for the machine-specific GPIO configuration, two files were created in <linux/platform_data/gpio-samsung-s3c[24|64]xx.h>, but as that namespace shall be used for defining data exchanged between machines and drivers, using it for these broad macros and config settings is wrong.
Move the headers back into the machine-local <mach/gpio-samsung.h> file and think about the next step.
Reported-by Arnd Bergmann <[email protected]>
Cc Tomasz Figa <[email protected]>
Cc Sylwester Nawrocki <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc Heiko Stuebner <[email protected]>
Cc Mark Brown <[email protected]>
Cc linux-samsung-soc at vger.kernel.org
Signed-off-by Linus Walleij <[email protected]>

Quoted 5 lines

---
Maintainers (Kukjin especially) - it'd be nice with a speedy ACK if this looks OK. I will put it into linux-next immediately so things are in order and smoketested for the merge window.
---

Acked-by Heiko Stuebner <[email protected]>

Tushar Behera

2014-01-15 09:11 UTC #4 lore raw

PATCH 1/1 ARM: S3C[24|64]xx: move includes back under <mach/> scope

In reply to Linus Walleij

Quoted 10 lines · Linus Walleij

When refactoring and breaking out the includes for the machine-specific GPIO configuration, two files were created in <linux/platform_data/gpio-samsung-s3c[24|64]xx.h>, but as that namespace shall be used for defining data exchanged between machines and drivers, using it for these broad macros and config settings is wrong.
Move the headers back into the machine-local <mach/gpio-samsung.h> file and think about the next step.

<snip>

Quoted 5 lines

arch/arm/plat-samsung/pm-gpio.c +0 -0
index c4efa1c2a5d1..a9f7a37c4173 100644

arch/arm/plat-samsung/pm-gpio.c line 22

Quoted 10 lines

arch/arm/plat-samsung/pm-gpio.c +1 -6

@@ -19,12 +19,7 @@
 #include <linux/io.h>
 #include <linux/gpio.h>
 
-#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 <mach/gpio-samsung.h>

This inclusion should be protected by a check for CONFIG_ARCH_S3C24XX || CONFIG_ARCH_S3C64XX. Currently generating build errors for s5p64x0_defconfig, s5pc100_defconfig and s5pv210_defconfig on next-20140115.

Signature · 1 line

Tushar Behera

Arnd Bergmann

2014-01-15 09:43 UTC #5 lore raw

PATCH 1/1 ARM: S3C[24|64]xx: move includes back under <mach/> scope

Quoted 8 lines · On Wednesday 15 January 2014 14:41:01 Tushar Behera wrote:

Quoted 8 lines

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

index c4efa1c2a5d1..a9f7a37c4173 100644
@@ -19,12 +19,7 @@
 #include <linux/io.h>
 #include <linux/gpio.h>

Quoted 13 lines

arch/arm/plat-samsung/pm-gpio.c line 22
Quoted 7 lines
arch/arm/plat-samsung/pm-gpio.c +1 -6
-#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 <mach/gpio-samsung.h>
This inclusion should be protected by a check for CONFIG_ARCH_S3C24XX || CONFIG_ARCH_S3C64XX. Currently generating build errors for s5p64x0_defconfig, s5pc100_defconfig and s5pv210_defconfig on next-20140115.

I noticed the same problem, but I think a better solution would be to do the same change for s5p that Linus has done for s3c, which is to move the nonstandard contents of mach/gpio.h to mach/gpio-samsung.h.

Arnd

Linus Walleij

author

2014-01-15 12:51 UTC #6 lore raw

PATCH 1/1 ARM: S3C[24|64]xx: move includes back under <mach/> scope

Quoted 11 lines · Arnd Bergmann

Quoted 5 lines · On Wednesday 15 January 2014 14:41:01 Tushar Behera wrote:
This inclusion should be protected by a check for CONFIG_ARCH_S3C24XX || CONFIG_ARCH_S3C64XX. Currently generating build errors for s5p64x0_defconfig, s5pc100_defconfig and s5pv210_defconfig on next-20140115.
I noticed the same problem, but I think a better solution would be to do the same change for s5p that Linus has done for s3c, which is to move the nonstandard contents of mach/gpio.h to mach/gpio-samsung.h.

Hm I just applied a fixup from Sachin adding #ifdefs back in but maybe I should try to fix it up like that instead. Just a minute...

Yours,
Linus Walleij

Linus Walleij

author

2014-01-15 12:58 UTC #7 lore raw

PATCH 1/1 ARM: S3C[24|64]xx: move includes back under <mach/> scope

In reply to Arnd Bergmann

Quoted 23 lines · Arnd Bergmann

Quoted 8 lines · On Wednesday 15 January 2014 14:41:01 Tushar Behera wrote:
Quoted 8 lines
arch/arm/plat-samsung/pm-gpio.c +0 -0
index c4efa1c2a5d1..a9f7a37c4173 100644
@@ -19,12 +19,7 @@
 #include <linux/io.h>
 #include <linux/gpio.h>
 
Quoted 13 lines
arch/arm/plat-samsung/pm-gpio.c line 22
Quoted 7 lines
arch/arm/plat-samsung/pm-gpio.c +1 -6
-#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 <mach/gpio-samsung.h>
This inclusion should be protected by a check for CONFIG_ARCH_S3C24XX || CONFIG_ARCH_S3C64XX. Currently generating build errors for s5p64x0_defconfig, s5pc100_defconfig and s5pv210_defconfig on next-20140115.

Quoted 4 lines

I noticed the same problem, but I think a better solution would be to do the same change for s5p that Linus has done for s3c, which is to move the nonstandard contents of mach/gpio.h to mach/gpio-samsung.h.

When I look at it, the issue also exist in e.g. drivers/gpio/gpio-samsung.c which can be compiled (like for allyesconfig) when PLAT_SAMSUNG is set.

And it is also set to y for ARCH_EXYNOS... which doesn't have any custom GPIO header. So this would involve something like creating an empty <mach/gpio-samsung.h> for Exynos which doesn't seem like the right thing to do.

So I'm sticking with the #ifdef patch for now as it seems to be the lesser evil :-/

Yours,
Linus Walleij

Arnd Bergmann

2014-01-15 13:19 UTC #8 lore raw

PATCH 1/1 ARM: S3C[24|64]xx: move includes back under <mach/> scope

Quoted 9 lines · Linus Walleij

When I look at it, the issue also exist in e.g. drivers/gpio/gpio-samsung.c which can be compiled (like for allyesconfig) when PLAT_SAMSUNG is set.
And it is also set to y for ARCH_EXYNOS... which doesn't have any custom GPIO header. So this would involve something like creating an empty <mach/gpio-samsung.h> for Exynos which doesn't seem like the right thing to do.

Ah, right. I looked at this before, but I misremembered about PLAT_SAMSUNG and thought it was fine because ARCH_EXYNOS no longer implied PLAT_SAMSUNG. That was wrong, instead ARCH_EXYNOS still sets PLAT_SAMSUNG but not PLAT_S5P as it used to.

Quoted 2 lines

So I'm sticking with the #ifdef patch for now as it seems to be the lesser evil :-/

Yes, agreed.

Arnd