diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-08-24 09:22:12 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-19 11:42:18 -0400 |
commit | 436d42c61c3eef1d02256174c8615046c61a28ad (patch) | |
tree | 307432ed7b49bde1715200ec2b32eb92e83187e5 /arch/arm/mach-s3c64xx | |
parent | c02cecb92ed49f36196ee9e29d29c4cfcbad05ae (diff) |
ARM: samsung: move platform_data definitions
Platform data for device drivers should be defined in
include/linux/platform_data/*.h, not in the architecture
and platform specific directories.
This moves such data out of the samsung include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Bryan Wu <bryan.wu@canonical.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: Chris Ball <cjb@laptop.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Liam Girdwood <lrg@ti.com>
Cc: linux-samsung-soc@vger.kernel.org
Diffstat (limited to 'arch/arm/mach-s3c64xx')
-rw-r--r-- | arch/arm/mach-s3c64xx/dev-audio.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-anw6410.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-hmt.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-mini6410.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-ncp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-real6410.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smartq.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6410.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/setup-i2c0.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/setup-i2c1.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/setup-ide.c | 2 |
14 files changed, 23 insertions, 23 deletions
diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c index 124fd5d63006..35f3e07eaccc 100644 --- a/arch/arm/mach-s3c64xx/dev-audio.c +++ b/arch/arm/mach-s3c64xx/dev-audio.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <mach/dma.h> | 20 | #include <mach/dma.h> |
21 | 21 | ||
22 | #include <plat/devs.h> | 22 | #include <plat/devs.h> |
23 | #include <plat/audio.h> | 23 | #include <linux/platform_data/asoc-s3c.h> |
24 | #include <plat/gpio-cfg.h> | 24 | #include <plat/gpio-cfg.h> |
25 | 25 | ||
26 | static const char *rclksrc[] = { | 26 | static const char *rclksrc[] = { |
diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c index ffa29ddfdfce..15c58dfc4584 100644 --- a/arch/arm/mach-s3c64xx/mach-anw6410.c +++ b/arch/arm/mach-s3c64xx/mach-anw6410.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #include <asm/mach-types.h> | 42 | #include <asm/mach-types.h> |
43 | 43 | ||
44 | #include <plat/regs-serial.h> | 44 | #include <plat/regs-serial.h> |
45 | #include <plat/iic.h> | 45 | #include <linux/platform_data/i2c-s3c2410.h> |
46 | #include <plat/fb.h> | 46 | #include <plat/fb.h> |
47 | #include <plat/regs-fb-v4.h> | 47 | #include <plat/regs-fb-v4.h> |
48 | 48 | ||
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c index 9e382e7c77cb..181aa99427fe 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <sound/wm8962.h> | 24 | #include <sound/wm8962.h> |
25 | #include <sound/wm9081.h> | 25 | #include <sound/wm9081.h> |
26 | 26 | ||
27 | #include <plat/s3c64xx-spi.h> | 27 | #include <linux/platform_data/spi-s3c64xx.h> |
28 | 28 | ||
29 | #include <mach/crag6410.h> | 29 | #include <mach/crag6410.h> |
30 | 30 | ||
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index 09cd81207a3f..717d675188d4 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c | |||
@@ -61,14 +61,14 @@ | |||
61 | #include <plat/fb.h> | 61 | #include <plat/fb.h> |
62 | #include <plat/sdhci.h> | 62 | #include <plat/sdhci.h> |
63 | #include <plat/gpio-cfg.h> | 63 | #include <plat/gpio-cfg.h> |
64 | #include <plat/s3c64xx-spi.h> | 64 | #include <linux/platform_data/spi-s3c64xx.h> |
65 | 65 | ||
66 | #include <plat/keypad.h> | 66 | #include <plat/keypad.h> |
67 | #include <plat/clock.h> | 67 | #include <plat/clock.h> |
68 | #include <plat/devs.h> | 68 | #include <plat/devs.h> |
69 | #include <plat/cpu.h> | 69 | #include <plat/cpu.h> |
70 | #include <plat/adc.h> | 70 | #include <plat/adc.h> |
71 | #include <plat/iic.h> | 71 | #include <linux/platform_data/i2c-s3c2410.h> |
72 | #include <plat/pm.h> | 72 | #include <plat/pm.h> |
73 | 73 | ||
74 | #include "common.h" | 74 | #include "common.h" |
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c index 689088162f77..02222b32b7d3 100644 --- a/arch/arm/mach-s3c64xx/mach-hmt.c +++ b/arch/arm/mach-s3c64xx/mach-hmt.c | |||
@@ -34,9 +34,9 @@ | |||
34 | #include <asm/mach-types.h> | 34 | #include <asm/mach-types.h> |
35 | 35 | ||
36 | #include <plat/regs-serial.h> | 36 | #include <plat/regs-serial.h> |
37 | #include <plat/iic.h> | 37 | #include <linux/platform_data/i2c-s3c2410.h> |
38 | #include <plat/fb.h> | 38 | #include <plat/fb.h> |
39 | #include <plat/nand.h> | 39 | #include <linux/platform_data/mtd-nand-s3c2410.h> |
40 | 40 | ||
41 | #include <plat/clock.h> | 41 | #include <plat/clock.h> |
42 | #include <plat/devs.h> | 42 | #include <plat/devs.h> |
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c index 5539a255a704..09311cc40115 100644 --- a/arch/arm/mach-s3c64xx/mach-mini6410.c +++ b/arch/arm/mach-s3c64xx/mach-mini6410.c | |||
@@ -38,9 +38,9 @@ | |||
38 | #include <plat/cpu.h> | 38 | #include <plat/cpu.h> |
39 | #include <plat/devs.h> | 39 | #include <plat/devs.h> |
40 | #include <plat/fb.h> | 40 | #include <plat/fb.h> |
41 | #include <plat/nand.h> | 41 | #include <linux/platform_data/mtd-nand-s3c2410.h> |
42 | #include <plat/regs-serial.h> | 42 | #include <plat/regs-serial.h> |
43 | #include <plat/ts.h> | 43 | #include <linux/platform_data/touchscreen-s3c2410.h> |
44 | #include <plat/regs-fb-v4.h> | 44 | #include <plat/regs-fb-v4.h> |
45 | 45 | ||
46 | #include <video/platform_lcd.h> | 46 | #include <video/platform_lcd.h> |
diff --git a/arch/arm/mach-s3c64xx/mach-ncp.c b/arch/arm/mach-s3c64xx/mach-ncp.c index cad2e05eddf7..46ee88d16815 100644 --- a/arch/arm/mach-s3c64xx/mach-ncp.c +++ b/arch/arm/mach-s3c64xx/mach-ncp.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include <asm/mach-types.h> | 37 | #include <asm/mach-types.h> |
38 | 38 | ||
39 | #include <plat/regs-serial.h> | 39 | #include <plat/regs-serial.h> |
40 | #include <plat/iic.h> | 40 | #include <linux/platform_data/i2c-s3c2410.h> |
41 | #include <plat/fb.h> | 41 | #include <plat/fb.h> |
42 | 42 | ||
43 | #include <plat/clock.h> | 43 | #include <plat/clock.h> |
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c index 326b21604bc3..6daca203e72b 100644 --- a/arch/arm/mach-s3c64xx/mach-real6410.c +++ b/arch/arm/mach-s3c64xx/mach-real6410.c | |||
@@ -39,9 +39,9 @@ | |||
39 | #include <plat/cpu.h> | 39 | #include <plat/cpu.h> |
40 | #include <plat/devs.h> | 40 | #include <plat/devs.h> |
41 | #include <plat/fb.h> | 41 | #include <plat/fb.h> |
42 | #include <plat/nand.h> | 42 | #include <linux/platform_data/mtd-nand-s3c2410.h> |
43 | #include <plat/regs-serial.h> | 43 | #include <plat/regs-serial.h> |
44 | #include <plat/ts.h> | 44 | #include <linux/platform_data/touchscreen-s3c2410.h> |
45 | #include <plat/regs-fb-v4.h> | 45 | #include <plat/regs-fb-v4.h> |
46 | 46 | ||
47 | #include <video/platform_lcd.h> | 47 | #include <video/platform_lcd.h> |
diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c b/arch/arm/mach-s3c64xx/mach-smartq.c index ceeb1de40376..c6d7390939ae 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq.c +++ b/arch/arm/mach-s3c64xx/mach-smartq.c | |||
@@ -30,13 +30,13 @@ | |||
30 | #include <plat/clock.h> | 30 | #include <plat/clock.h> |
31 | #include <plat/cpu.h> | 31 | #include <plat/cpu.h> |
32 | #include <plat/devs.h> | 32 | #include <plat/devs.h> |
33 | #include <plat/iic.h> | 33 | #include <linux/platform_data/i2c-s3c2410.h> |
34 | #include <plat/gpio-cfg.h> | 34 | #include <plat/gpio-cfg.h> |
35 | #include <plat/hwmon.h> | 35 | #include <linux/platform_data/hwmon-s3c.h> |
36 | #include <plat/regs-serial.h> | 36 | #include <plat/regs-serial.h> |
37 | #include <plat/usb-control.h> | 37 | #include <linux/platform_data/usb-ohci-s3c2410.h> |
38 | #include <plat/sdhci.h> | 38 | #include <plat/sdhci.h> |
39 | #include <plat/ts.h> | 39 | #include <linux/platform_data/touchscreen-s3c2410.h> |
40 | 40 | ||
41 | #include <video/platform_lcd.h> | 41 | #include <video/platform_lcd.h> |
42 | 42 | ||
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6400.c b/arch/arm/mach-s3c64xx/mach-smdk6400.c index b0f4525c66bd..a928fae5694e 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6400.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6400.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include <plat/clock.h> | 35 | #include <plat/clock.h> |
36 | #include <plat/devs.h> | 36 | #include <plat/devs.h> |
37 | #include <plat/cpu.h> | 37 | #include <plat/cpu.h> |
38 | #include <plat/iic.h> | 38 | #include <linux/platform_data/i2c-s3c2410.h> |
39 | 39 | ||
40 | #include "common.h" | 40 | #include "common.h" |
41 | 41 | ||
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index 0fe4f1503f4f..2547a8846472 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c | |||
@@ -60,8 +60,8 @@ | |||
60 | #include <mach/regs-gpio.h> | 60 | #include <mach/regs-gpio.h> |
61 | #include <mach/regs-sys.h> | 61 | #include <mach/regs-sys.h> |
62 | #include <mach/regs-srom.h> | 62 | #include <mach/regs-srom.h> |
63 | #include <plat/ata.h> | 63 | #include <linux/platform_data/ata-samsung_cf.h> |
64 | #include <plat/iic.h> | 64 | #include <linux/platform_data/i2c-s3c2410.h> |
65 | #include <plat/fb.h> | 65 | #include <plat/fb.h> |
66 | #include <plat/gpio-cfg.h> | 66 | #include <plat/gpio-cfg.h> |
67 | 67 | ||
@@ -69,7 +69,7 @@ | |||
69 | #include <plat/devs.h> | 69 | #include <plat/devs.h> |
70 | #include <plat/cpu.h> | 70 | #include <plat/cpu.h> |
71 | #include <plat/adc.h> | 71 | #include <plat/adc.h> |
72 | #include <plat/ts.h> | 72 | #include <linux/platform_data/touchscreen-s3c2410.h> |
73 | #include <plat/keypad.h> | 73 | #include <plat/keypad.h> |
74 | #include <plat/backlight.h> | 74 | #include <plat/backlight.h> |
75 | #include <plat/regs-fb-v4.h> | 75 | #include <plat/regs-fb-v4.h> |
diff --git a/arch/arm/mach-s3c64xx/setup-i2c0.c b/arch/arm/mach-s3c64xx/setup-i2c0.c index 241af94a9e70..40666ba8d607 100644 --- a/arch/arm/mach-s3c64xx/setup-i2c0.c +++ b/arch/arm/mach-s3c64xx/setup-i2c0.c | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | struct platform_device; /* don't need the contents */ | 19 | struct platform_device; /* don't need the contents */ |
20 | 20 | ||
21 | #include <plat/iic.h> | 21 | #include <linux/platform_data/i2c-s3c2410.h> |
22 | #include <plat/gpio-cfg.h> | 22 | #include <plat/gpio-cfg.h> |
23 | 23 | ||
24 | void s3c_i2c0_cfg_gpio(struct platform_device *dev) | 24 | void s3c_i2c0_cfg_gpio(struct platform_device *dev) |
diff --git a/arch/arm/mach-s3c64xx/setup-i2c1.c b/arch/arm/mach-s3c64xx/setup-i2c1.c index 3d13a961986d..3fdb24c4e62a 100644 --- a/arch/arm/mach-s3c64xx/setup-i2c1.c +++ b/arch/arm/mach-s3c64xx/setup-i2c1.c | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | struct platform_device; /* don't need the contents */ | 19 | struct platform_device; /* don't need the contents */ |
20 | 20 | ||
21 | #include <plat/iic.h> | 21 | #include <linux/platform_data/i2c-s3c2410.h> |
22 | #include <plat/gpio-cfg.h> | 22 | #include <plat/gpio-cfg.h> |
23 | 23 | ||
24 | void s3c_i2c1_cfg_gpio(struct platform_device *dev) | 24 | void s3c_i2c1_cfg_gpio(struct platform_device *dev) |
diff --git a/arch/arm/mach-s3c64xx/setup-ide.c b/arch/arm/mach-s3c64xx/setup-ide.c index 41b425602d88..648d8b85bf6b 100644 --- a/arch/arm/mach-s3c64xx/setup-ide.c +++ b/arch/arm/mach-s3c64xx/setup-ide.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <mach/map.h> | 17 | #include <mach/map.h> |
18 | #include <mach/regs-clock.h> | 18 | #include <mach/regs-clock.h> |
19 | #include <plat/gpio-cfg.h> | 19 | #include <plat/gpio-cfg.h> |
20 | #include <plat/ata.h> | 20 | #include <linux/platform_data/ata-samsung_cf.h> |
21 | 21 | ||
22 | void s3c64xx_ide_setup_gpio(void) | 22 | void s3c64xx_ide_setup_gpio(void) |
23 | { | 23 | { |