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

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

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 <arnd@arndb.de>
Cc: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: linux-samsung-soc@vger.kernel.org
Acked-by: Mark Brown <broonie@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Linus Walleij 12 years ago b0161caa ccb6fbb9

+56 -67

58 changed files

expand all collapse all

arch

arm

mach-s3c24xx

common-smdk.c

h1940-bluetooth.c

include

mach

gpio-samsung.h

mach-amlm5900.c

mach-anubis.c

mach-at2440evb.c

mach-bast.c

mach-gta02.c

mach-h1940.c

mach-jive.c

mach-mini2440.c

mach-n30.c

mach-nexcoder.c

mach-osiris-dvs.c

mach-osiris.c

mach-qt2410.c

mach-rx1950.c

mach-rx3715.c

mach-smdk2413.c

mach-smdk2416.c

mach-vr1000.c

pm-s3c2410.c

pm.c

s3c2410.c

s3c2416.c

s3c2440.c

s3c2442.c

s3c2443.c

setup-i2c.c

setup-sdhci-gpio.c

setup-ts.c

simtec-usb.c

mach-s3c64xx

common.c

crag6410.h

dev-audio.c

include

mach

gpio-samsung.h

mach-anw6410.c

mach-crag6410.c

mach-hmt.c

mach-mini6410.c

mach-real6410.c

mach-smartq.c

mach-smartq5.c

mach-smartq7.c

mach-smdk6400.c

mach-smdk6410.c

pm.c

setup-fb-24bpp.c

setup-i2c0.c

setup-i2c1.c

setup-ide.c

setup-keypad.c

setup-sdhci-gpio.c

setup-spi.c

plat-samsung

pm-gpio.c

setup-camif.c

drivers

gpio

gpio-samsung.c

mmc

host

s3cmci.c

+1 -1

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

reviewed

··· 37 37 #include <asm/irq.h> 38 38 39 39 #include <mach/regs-gpio.h> 40 40 + #include <mach/gpio-samsung.h> 40 41 #include <linux/platform_data/leds-s3c24xx.h> 41 41 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 42 42 #include <linux/platform_data/mtd-nand-s3c2410.h> 43 43 44 44 #include <plat/gpio-cfg.h>

+1 -1

arch/arm/mach-s3c24xx/h1940-bluetooth.c

reviewed

··· 18 18 #include <linux/leds.h> 19 19 #include <linux/gpio.h> 20 20 #include <linux/rfkill.h> 21 21 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 22 21 23 22 #include <mach/hardware.h> 24 23 #include <mach/regs-gpio.h> 24 24 + #include <mach/gpio-samsung.h> 25 25 26 26 #include "h1940.h" 27 27

+1 -1

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

reviewed

··· 52 52 #include <plat/regs-serial.h> 53 53 #include <mach/regs-lcd.h> 54 54 #include <mach/regs-gpio.h> 55 55 + #include <mach/gpio-samsung.h> 55 56 56 57 #include <linux/platform_data/i2c-s3c2410.h> 57 57 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 58 58 #include <plat/devs.h> 59 59 #include <plat/cpu.h> 60 60 #include <plat/gpio-cfg.h>

+1 -1

arch/arm/mach-s3c24xx/mach-anubis.c

reviewed

··· 35 35 #include <plat/regs-serial.h> 36 36 #include <mach/regs-gpio.h> 37 37 #include <mach/regs-lcd.h> 38 38 + #include <mach/gpio-samsung.h> 38 39 #include <linux/platform_data/mtd-nand-s3c2410.h> 39 40 #include <linux/platform_data/i2c-s3c2410.h> 40 40 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 41 41 42 42 #include <linux/mtd/mtd.h> 43 43 #include <linux/mtd/nand.h>

+1 -1

arch/arm/mach-s3c24xx/mach-at2440evb.c

reviewed

··· 36 36 #include <plat/regs-serial.h> 37 37 #include <mach/regs-gpio.h> 38 38 #include <mach/regs-lcd.h> 39 39 + #include <mach/gpio-samsung.h> 39 40 #include <linux/platform_data/mtd-nand-s3c2410.h> 40 41 #include <linux/platform_data/i2c-s3c2410.h> 41 41 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 42 42 43 43 #include <linux/mtd/mtd.h> 44 44 #include <linux/mtd/nand.h>

+1 -1

arch/arm/mach-s3c24xx/mach-bast.c

reviewed

··· 35 35 #include <linux/platform_data/hwmon-s3c.h> 36 36 #include <linux/platform_data/i2c-s3c2410.h> 37 37 #include <linux/platform_data/mtd-nand-s3c2410.h> 38 38 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 39 38 40 39 #include <net/ax88796.h> 41 40 ··· 48 49 #include <mach/hardware.h> 49 50 #include <mach/regs-gpio.h> 50 51 #include <mach/regs-lcd.h> 52 52 + #include <mach/gpio-samsung.h> 51 53 52 54 #include <plat/clock.h> 53 55 #include <plat/cpu.h>

+1 -1

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

reviewed

··· 70 70 #include <linux/platform_data/touchscreen-s3c2410.h> 71 71 #include <linux/platform_data/usb-ohci-s3c2410.h> 72 72 #include <linux/platform_data/usb-s3c2410_udc.h> 73 73 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 74 73 75 74 #include <mach/fb.h> 76 75 #include <mach/hardware.h> 77 76 #include <mach/regs-gpio.h> 78 77 #include <mach/regs-irq.h> 78 78 + #include <mach/gpio-samsung.h> 79 79 80 80 #include <plat/cpu.h> 81 81 #include <plat/devs.h>

+1 -1

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

reviewed

··· 46 46 #include <linux/platform_data/mmc-s3cmci.h> 47 47 #include <linux/platform_data/touchscreen-s3c2410.h> 48 48 #include <linux/platform_data/usb-s3c2410_udc.h> 49 49 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 50 49 51 50 #include <sound/uda1380.h> 52 51 ··· 54 55 #include <mach/regs-clock.h> 55 56 #include <mach/regs-gpio.h> 56 57 #include <mach/regs-lcd.h> 58 58 + #include <mach/gpio-samsung.h> 57 59 58 60 #include <plat/clock.h> 59 61 #include <plat/cpu.h>

+1 -1

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

reviewed

··· 34 34 #include <plat/regs-serial.h> 35 35 #include <linux/platform_data/mtd-nand-s3c2410.h> 36 36 #include <linux/platform_data/i2c-s3c2410.h> 37 37 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 38 37 39 38 #include <mach/regs-gpio.h> 40 39 #include <mach/regs-lcd.h> 41 40 #include <mach/fb.h> 41 41 + #include <mach/gpio-samsung.h> 42 42 43 43 #include <asm/mach-types.h> 44 44

+1 -1

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

reviewed

··· 42 42 #include <linux/platform_data/leds-s3c24xx.h> 43 43 #include <mach/regs-lcd.h> 44 44 #include <mach/irqs.h> 45 45 + #include <mach/gpio-samsung.h> 45 46 #include <linux/platform_data/mtd-nand-s3c2410.h> 46 47 #include <linux/platform_data/i2c-s3c2410.h> 47 48 #include <linux/platform_data/mmc-s3cmci.h> 48 49 #include <linux/platform_data/usb-s3c2410_udc.h> 49 49 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 50 50 51 51 #include <linux/mtd/mtd.h> 52 52 #include <linux/mtd/nand.h>

+1 -1

arch/arm/mach-s3c24xx/mach-n30.c

reviewed

··· 36 36 #include <linux/platform_data/leds-s3c24xx.h> 37 37 #include <mach/regs-gpio.h> 38 38 #include <mach/regs-lcd.h> 39 39 + #include <mach/gpio-samsung.h> 39 40 40 41 #include <asm/mach/arch.h> 41 42 #include <asm/mach/irq.h> 42 43 #include <asm/mach/map.h> 43 44 44 45 #include <linux/platform_data/i2c-s3c2410.h> 45 45 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 46 46 #include <plat/regs-serial.h> 47 47 48 48 #include <plat/clock.h>

+1 -1

arch/arm/mach-s3c24xx/mach-nexcoder.c

reviewed

··· 37 37 38 38 //#include <asm/debug-ll.h> 39 39 #include <mach/regs-gpio.h> 40 40 + #include <mach/gpio-samsung.h> 40 41 #include <plat/regs-serial.h> 41 42 #include <linux/platform_data/i2c-s3c2410.h> 42 42 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 43 43 44 44 #include <plat/gpio-cfg.h> 45 45 #include <plat/clock.h>

+1 -1

arch/arm/mach-s3c24xx/mach-osiris-dvs.c

reviewed

··· 16 16 #include <linux/platform_device.h> 17 17 #include <linux/cpufreq.h> 18 18 #include <linux/gpio.h> 19 19 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 20 19 21 20 #include <linux/i2c/tps65010.h> 22 21 23 22 #include <plat/cpu-freq.h> 23 23 + #include <mach/gpio-samsung.h> 24 24 25 25 #define OSIRIS_GPIO_DVS S3C2410_GPB(5) 26 26

+1 -1

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

reviewed

··· 33 33 34 34 #include <linux/platform_data/mtd-nand-s3c2410.h> 35 35 #include <linux/platform_data/i2c-s3c2410.h> 36 36 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 37 36 38 37 #include <linux/mtd/mtd.h> 39 38 #include <linux/mtd/nand.h> ··· 50 51 #include <mach/hardware.h> 51 52 #include <mach/regs-gpio.h> 52 53 #include <mach/regs-lcd.h> 54 54 + #include <mach/gpio-samsung.h> 53 55 54 56 #include "common.h" 55 57 #include "osiris.h"

+1 -1

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

reviewed

··· 54 54 #include <linux/platform_data/mtd-nand-s3c2410.h> 55 55 #include <linux/platform_data/usb-s3c2410_udc.h> 56 56 #include <linux/platform_data/i2c-s3c2410.h> 57 57 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 57 57 + #include <mach/gpio-samsung.h> 58 58 59 59 #include <plat/gpio-cfg.h> 60 60 #include <plat/devs.h>

+1 -1

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

reviewed

··· 45 45 #include <linux/platform_data/mtd-nand-s3c2410.h> 46 46 #include <linux/platform_data/touchscreen-s3c2410.h> 47 47 #include <linux/platform_data/usb-s3c2410_udc.h> 48 48 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 49 48 50 49 #include <sound/uda1380.h> 51 50 52 51 #include <mach/fb.h> 53 52 #include <mach/regs-gpio.h> 54 53 #include <mach/regs-lcd.h> 54 54 + #include <mach/gpio-samsung.h> 55 55 56 56 #include <plat/clock.h> 57 57 #include <plat/cpu.h>

+1 -1

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

reviewed

··· 35 35 #include <asm/mach/map.h> 36 36 37 37 #include <linux/platform_data/mtd-nand-s3c2410.h> 38 38 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 39 38 40 39 #include <asm/irq.h> 41 40 #include <asm/mach-types.h> ··· 43 44 #include <mach/hardware.h> 44 45 #include <mach/regs-gpio.h> 45 46 #include <mach/regs-lcd.h> 47 47 + #include <mach/gpio-samsung.h> 46 48 47 49 #include <plat/clock.h> 48 50 #include <plat/cpu.h>

+1 -1

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

reviewed

··· 39 39 40 40 #include <linux/platform_data/usb-s3c2410_udc.h> 41 41 #include <linux/platform_data/i2c-s3c2410.h> 42 42 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 42 42 + #include <mach/gpio-samsung.h> 43 43 #include <mach/fb.h> 44 44 45 45 #include <plat/clock.h>

+1 -1

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

reviewed

··· 38 38 #include <mach/regs-gpio.h> 39 39 #include <mach/regs-lcd.h> 40 40 #include <mach/regs-s3c2443-clock.h> 41 41 + #include <mach/gpio-samsung.h> 41 42 42 43 #include <linux/platform_data/leds-s3c24xx.h> 43 44 #include <linux/platform_data/i2c-s3c2410.h> 44 44 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 45 45 46 46 #include <plat/gpio-cfg.h> 47 47 #include <plat/clock.h>

+1 -1

arch/arm/mach-s3c24xx/mach-vr1000.c

reviewed

··· 37 37 #include <linux/platform_data/leds-s3c24xx.h> 38 38 #include <linux/platform_data/i2c-s3c2410.h> 39 39 #include <linux/platform_data/asoc-s3c24xx_simtec.h> 40 40 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 41 40 42 41 #include <mach/hardware.h> 43 42 #include <mach/regs-gpio.h> 43 43 + #include <mach/gpio-samsung.h> 44 44 45 45 #include <plat/clock.h> 46 46 #include <plat/cpu.h>

+1 -1

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

reviewed

··· 28 28 #include <linux/syscore_ops.h> 29 29 #include <linux/gpio.h> 30 30 #include <linux/io.h> 31 31 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 32 31 33 32 #include <asm/mach-types.h> 34 33 35 34 #include <mach/hardware.h> 36 35 #include <mach/regs-gpio.h> 36 36 + #include <mach/gpio-samsung.h> 37 37 38 38 #include <plat/cpu.h> 39 39 #include <plat/pm.h>

+1 -1

arch/arm/mach-s3c24xx/pm.c

reviewed

··· 34 34 #include <linux/interrupt.h> 35 35 #include <linux/serial_core.h> 36 36 #include <linux/io.h> 37 37 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 38 37 39 38 #include <plat/regs-serial.h> 40 39 #include <mach/regs-clock.h> 41 40 #include <mach/regs-gpio.h> 42 41 #include <mach/regs-irq.h> 42 42 + #include <mach/gpio-samsung.h> 43 43 44 44 #include <asm/mach/time.h> 45 45

+1 -1

arch/arm/mach-s3c24xx/s3c2410.c

reviewed

··· 24 24 #include <linux/platform_device.h> 25 25 #include <linux/reboot.h> 26 26 #include <linux/io.h> 27 27 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 28 27 29 28 #include <asm/mach/arch.h> 30 29 #include <asm/mach/map.h> 31 30 #include <asm/mach/irq.h> 32 31 33 32 #include <mach/hardware.h> 33 33 + #include <mach/gpio-samsung.h> 34 34 #include <asm/irq.h> 35 35 #include <asm/system_misc.h> 36 36

+1 -1

arch/arm/mach-s3c24xx/s3c2416.c

reviewed

··· 36 36 #include <linux/clk.h> 37 37 #include <linux/io.h> 38 38 #include <linux/reboot.h> 39 39 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 40 39 41 40 #include <asm/mach/arch.h> 42 41 #include <asm/mach/map.h> 43 42 #include <asm/mach/irq.h> 44 43 45 44 #include <mach/hardware.h> 45 45 + #include <mach/gpio-samsung.h> 46 46 #include <asm/proc-fns.h> 47 47 #include <asm/irq.h> 48 48 #include <asm/system_misc.h>

+1 -1

arch/arm/mach-s3c24xx/s3c2440.c

reviewed

··· 23 23 #include <linux/gpio.h> 24 24 #include <linux/clk.h> 25 25 #include <linux/io.h> 26 26 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 27 26 28 27 #include <asm/mach/arch.h> 29 28 #include <asm/mach/map.h> 30 29 #include <asm/mach/irq.h> 31 30 32 31 #include <mach/hardware.h> 32 32 + #include <mach/gpio-samsung.h> 33 33 #include <asm/irq.h> 34 34 35 35 #include <plat/devs.h>

+1 -1

arch/arm/mach-s3c24xx/s3c2442.c

reviewed

··· 35 35 #include <linux/gpio.h> 36 36 #include <linux/clk.h> 37 37 #include <linux/io.h> 38 38 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 39 38 40 39 #include <mach/hardware.h> 40 40 + #include <mach/gpio-samsung.h> 41 41 #include <linux/atomic.h> 42 42 #include <asm/irq.h> 43 43

+1 -1

arch/arm/mach-s3c24xx/s3c2443.c

reviewed

··· 23 23 #include <linux/clk.h> 24 24 #include <linux/io.h> 25 25 #include <linux/reboot.h> 26 26 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 27 26 28 27 #include <asm/mach/arch.h> 29 28 #include <asm/mach/map.h> 30 29 #include <asm/mach/irq.h> 31 30 32 31 #include <mach/hardware.h> 32 32 + #include <mach/gpio-samsung.h> 33 33 #include <asm/irq.h> 34 34 #include <asm/system_misc.h> 35 35

+1 -1

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

reviewed

··· 17 17 18 18 #include <plat/gpio-cfg.h> 19 19 #include <linux/platform_data/i2c-s3c2410.h> 20 20 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 21 20 #include <mach/hardware.h> 22 21 #include <mach/regs-gpio.h> 22 22 + #include <mach/gpio-samsung.h> 23 23 24 24 void s3c_i2c0_cfg_gpio(struct platform_device *dev) 25 25 {

+1 -1

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

reviewed

··· 18 18 #include <linux/platform_device.h> 19 19 #include <linux/io.h> 20 20 #include <linux/gpio.h> 21 21 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 22 21 23 22 #include <mach/regs-gpio.h> 23 23 + #include <mach/gpio-samsung.h> 24 24 #include <plat/gpio-cfg.h> 25 25 26 26 void s3c2416_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)

+1 -1

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

reviewed

··· 12 12 13 13 #include <linux/kernel.h> 14 14 #include <linux/gpio.h> 15 15 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 16 15 17 16 struct platform_device; /* don't need the contents */ 18 17 19 18 #include <mach/hardware.h> 19 19 + #include <mach/gpio-samsung.h> 20 20 21 21 /** 22 22 * s3c24xx_ts_cfg_gpio - configure gpio for s3c2410 systems

+1 -1

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

reviewed

··· 29 29 #include <asm/mach/irq.h> 30 30 31 31 #include <mach/hardware.h> 32 32 + #include <mach/gpio-samsung.h> 32 33 #include <asm/irq.h> 33 34 34 35 #include <linux/platform_data/usb-ohci-s3c2410.h> 35 35 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 36 36 #include <plat/devs.h> 37 37 38 38 #include "bast.h"

+1 -1

arch/arm/mach-s3c64xx/common.c

reviewed

··· 32 32 #include <linux/irq.h> 33 33 #include <linux/gpio.h> 34 34 #include <linux/irqchip/arm-vic.h> 35 35 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 36 35 #include <clocksource/samsung_pwm.h> 37 36 38 37 #include <asm/mach/arch.h> ··· 41 42 #include <mach/map.h> 42 43 #include <mach/hardware.h> 43 44 #include <mach/regs-gpio.h> 45 45 + #include <mach/gpio-samsung.h> 44 46 45 47 #include <plat/cpu.h> 46 48 #include <plat/devs.h>

+1 -1

arch/arm/mach-s3c64xx/crag6410.h

reviewed

··· 11 11 #ifndef MACH_CRAG6410_H 12 12 #define MACH_CRAG6410_H 13 13 14 14 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 14 14 + #include <mach/gpio-samsung.h> 15 15 16 16 #define GLENFARCLAS_PMIC_IRQ_BASE IRQ_BOARD_START 17 17

+1 -1

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

reviewed

··· 21 21 22 22 #include <plat/devs.h> 23 23 #include <linux/platform_data/asoc-s3c.h> 24 24 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 25 24 #include <plat/gpio-cfg.h> 25 25 + #include <mach/gpio-samsung.h> 26 26 27 27 static int s3c64xx_i2s_cfg_gpio(struct platform_device *pdev) 28 28 {

+1 -1

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

reviewed

··· 43 43 44 44 #include <plat/regs-serial.h> 45 45 #include <linux/platform_data/i2c-s3c2410.h> 46 46 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 47 46 #include <plat/fb.h> 48 47 49 48 #include <plat/clock.h> 50 49 #include <plat/devs.h> 51 50 #include <plat/cpu.h> 52 51 #include <mach/regs-gpio.h> 52 52 + #include <mach/gpio-samsung.h> 53 53 #include <plat/samsung-time.h> 54 54 55 55 #include "common.h"

+1 -2

arch/arm/mach-s3c64xx/mach-crag6410.c

reviewed

··· 32 32 33 33 #include <linux/platform_data/pca953x.h> 34 34 #include <linux/platform_data/s3c-hsotg.h> 35 35 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 36 35 37 36 #include <video/platform_lcd.h> 38 37 ··· 48 49 #include <video/samsung_fimd.h> 49 50 #include <mach/hardware.h> 50 51 #include <mach/map.h> 51 51 - 52 52 #include <mach/regs-gpio.h> 53 53 + #include <mach/gpio-samsung.h> 53 54 54 55 #include <plat/regs-serial.h> 55 56 #include <plat/fb.h>

+1 -1

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

reviewed

··· 35 35 36 36 #include <plat/regs-serial.h> 37 37 #include <linux/platform_data/i2c-s3c2410.h> 38 38 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 38 38 + #include <mach/gpio-samsung.h> 39 39 #include <plat/fb.h> 40 40 #include <linux/platform_data/mtd-nand-s3c2410.h> 41 41

+1 -1

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

reviewed

··· 30 30 31 31 #include <mach/map.h> 32 32 #include <mach/regs-gpio.h> 33 33 + #include <mach/gpio-samsung.h> 33 34 34 35 #include <plat/adc.h> 35 36 #include <plat/cpu.h> ··· 39 38 #include <linux/platform_data/mtd-nand-s3c2410.h> 40 39 #include <plat/regs-serial.h> 41 40 #include <linux/platform_data/touchscreen-s3c2410.h> 42 42 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 43 41 44 42 #include <video/platform_lcd.h> 45 43 #include <video/samsung_fimd.h>

+1 -1

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

reviewed

··· 31 31 32 32 #include <mach/map.h> 33 33 #include <mach/regs-gpio.h> 34 34 + #include <mach/gpio-samsung.h> 34 35 35 36 #include <plat/adc.h> 36 37 #include <plat/cpu.h> ··· 40 39 #include <linux/platform_data/mtd-nand-s3c2410.h> 41 40 #include <plat/regs-serial.h> 42 41 #include <linux/platform_data/touchscreen-s3c2410.h> 43 43 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 44 42 45 43 #include <video/platform_lcd.h> 46 44 #include <video/samsung_fimd.h>

+1 -1

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

reviewed

··· 25 25 26 26 #include <mach/map.h> 27 27 #include <mach/regs-gpio.h> 28 28 + #include <mach/gpio-samsung.h> 28 29 29 30 #include <plat/clock.h> 30 31 #include <plat/cpu.h> ··· 37 36 #include <linux/platform_data/usb-ohci-s3c2410.h> 38 37 #include <plat/sdhci.h> 39 38 #include <linux/platform_data/touchscreen-s3c2410.h> 40 40 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 41 39 42 40 #include <video/platform_lcd.h> 43 41 #include <plat/samsung-time.h>

+1 -1

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

reviewed

··· 16 16 #include <linux/input.h> 17 17 #include <linux/leds.h> 18 18 #include <linux/platform_device.h> 19 19 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 20 19 21 20 #include <asm/mach-types.h> 22 21 #include <asm/mach/arch.h> ··· 23 24 #include <video/samsung_fimd.h> 24 25 #include <mach/map.h> 25 26 #include <mach/regs-gpio.h> 27 27 + #include <mach/gpio-samsung.h> 26 28 27 29 #include <plat/cpu.h> 28 30 #include <plat/devs.h>

+1 -1

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

reviewed

+1 -1

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

reviewed

··· 35 35 #include <plat/devs.h> 36 36 #include <plat/cpu.h> 37 37 #include <linux/platform_data/i2c-s3c2410.h> 38 38 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 38 38 + #include <mach/gpio-samsung.h> 39 39 #include <plat/samsung-time.h> 40 40 41 41 #include "common.h"

+1 -1

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

reviewed

··· 31 31 #include <linux/regulator/machine.h> 32 32 #include <linux/pwm_backlight.h> 33 33 #include <linux/platform_data/s3c-hsotg.h> 34 34 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 35 34 36 35 #ifdef CONFIG_SMDK6410_WM1190_EV1 37 36 #include <linux/mfd/wm8350/core.h> ··· 57 58 58 59 #include <plat/regs-serial.h> 59 60 #include <mach/regs-gpio.h> 61 61 + #include <mach/gpio-samsung.h> 60 62 #include <linux/platform_data/ata-samsung_cf.h> 61 63 #include <linux/platform_data/i2c-s3c2410.h> 62 64 #include <plat/fb.h>

+1 -1

arch/arm/mach-s3c64xx/pm.c

reviewed

··· 18 18 #include <linux/io.h> 19 19 #include <linux/gpio.h> 20 20 #include <linux/pm_domain.h> 21 21 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 22 21 23 22 #include <mach/map.h> 24 23 #include <mach/irqs.h> ··· 28 29 29 30 #include <mach/regs-gpio.h> 30 31 #include <mach/regs-clock.h> 32 32 + #include <mach/gpio-samsung.h> 31 33 32 34 #include "regs-gpio-memport.h" 33 35 #include "regs-modem.h"

+1 -1

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

reviewed

··· 16 16 #include <linux/types.h> 17 17 #include <linux/fb.h> 18 18 #include <linux/gpio.h> 19 19 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 20 19 21 20 #include <plat/fb.h> 22 21 #include <plat/gpio-cfg.h> 22 22 + #include <mach/gpio-samsung.h> 23 23 24 24 void s3c64xx_fb_gpio_setup_24bpp(void) 25 25 {

+1 -1

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

reviewed

··· 19 19 struct platform_device; /* don't need the contents */ 20 20 21 21 #include <linux/platform_data/i2c-s3c2410.h> 22 22 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 23 22 #include <plat/gpio-cfg.h> 23 23 + #include <mach/gpio-samsung.h> 24 24 25 25 void s3c_i2c0_cfg_gpio(struct platform_device *dev) 26 26 {

+1 -1

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

reviewed

+1 -1

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

reviewed

··· 17 17 #include <mach/map.h> 18 18 #include <mach/regs-clock.h> 19 19 #include <plat/gpio-cfg.h> 20 20 + #include <mach/gpio-samsung.h> 20 21 #include <linux/platform_data/ata-samsung_cf.h> 21 21 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 22 22 23 23 void s3c64xx_ide_setup_gpio(void) 24 24 {

+1 -1

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

reviewed

··· 11 11 */ 12 12 13 13 #include <linux/gpio.h> 14 14 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 15 14 #include <plat/gpio-cfg.h> 16 15 #include <plat/keypad.h> 16 16 + #include <mach/gpio-samsung.h> 17 17 18 18 void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols) 19 19 {

+1 -1

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

reviewed

··· 17 17 #include <linux/platform_device.h> 18 18 #include <linux/io.h> 19 19 #include <linux/gpio.h> 20 20 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 21 20 22 21 #include <plat/gpio-cfg.h> 23 22 #include <plat/sdhci.h> 23 23 + #include <mach/gpio-samsung.h> 24 24 25 25 void s3c64xx_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width) 26 26 {

+1 -1

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

reviewed

··· 9 9 */ 10 10 11 11 #include <linux/gpio.h> 12 12 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 13 12 #include <plat/gpio-cfg.h> 13 13 + #include <mach/gpio-samsung.h> 14 14 15 15 #ifdef CONFIG_S3C64XX_DEV_SPI0 16 16 int s3c64xx_spi0_cfg_gpio(void)

+1 -6

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

reviewed

··· 19 19 #include <linux/io.h> 20 20 #include <linux/gpio.h> 21 21 22 22 - #ifdef CONFIG_ARCH_S3C24XX 23 23 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 24 24 - #endif 25 25 - #ifdef CONFIG_ARCH_S3C64XX 26 26 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 27 27 - #endif 22 22 + #include <mach/gpio-samsung.h> 28 23 #include <plat/gpio-core.h> 29 24 #include <plat/pm.h> 30 25

+1 -1

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

reviewed

··· 9 9 */ 10 10 11 11 #include <linux/gpio.h> 12 12 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 13 12 #include <plat/gpio-cfg.h> 13 13 + #include <mach/gpio-samsung.h> 14 14 15 15 /* Number of camera port pins, without FIELD */ 16 16 #define S3C_CAMIF_NUM_GPIOS 13

+1 -6

drivers/gpio/gpio-samsung.c

reviewed

··· 27 27 #include <linux/of.h> 28 28 #include <linux/slab.h> 29 29 #include <linux/of_address.h> 30 30 - #ifdef CONFIG_ARCH_S3C24XX 31 31 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 32 32 - #endif 33 33 - #ifdef CONFIG_ARCH_S3C64XX 34 34 - #include <linux/platform_data/gpio-samsung-s3c64xx.h> 35 35 - #endif 36 30 37 31 #include <asm/irq.h> 38 32 39 33 #include <mach/map.h> 40 34 #include <mach/regs-gpio.h> 35 35 + #include <mach/gpio-samsung.h> 41 36 42 37 #include <plat/cpu.h> 43 38 #include <plat/gpio-core.h>

+1 -1

drivers/mmc/host/s3cmci.c

reviewed

··· 24 24 #include <linux/io.h> 25 25 26 26 #include <mach/dma.h> 27 27 + #include <mach/gpio-samsung.h> 27 28 28 29 #include <linux/platform_data/mmc-s3cmci.h> 29 29 - #include <linux/platform_data/gpio-samsung-s3c24xx.h> 30 30 31 31 #include "s3cmci.h" 32 32

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

reviewed

include/linux/platform_data/gpio-samsung-s3c64xx.h arch/arm/mach-s3c64xx/include/mach/gpio-samsung.h

reviewed