Skip to contentSkip to conversation

ARM: big platform data header rename

PATCH In review Arnd Bergmann 36 participants 84 messages Sep 11, 2012 – Oct 6, 2012 1 message not in the archive Page 2 of 2

Subsystems (57)
Networking Network drivers Arm (32-bit) Media (V4L/DVB) +53 more subsystems
lore
Share & tools
lore
author
#67 lore raw

PATCH 14/16 ARM: orion: move platform_data definitions

In reply to Arnd Bergmann

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 orion include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Jason Cooper <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Vinod Koul <[email protected]>
Cc Dan Williams <[email protected]>
Cc Bryan Wu <[email protected]>
Cc Richard Purdie <[email protected]>
Cc Nicolas Pitre <[email protected]>
Cc Chris Ball <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Alan Stern <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
---
 arch/arm/mach-dove/common.c                                  |    2 +-
 arch/arm/mach-kirkwood/board-dreamplug.c                     |    2 +-
 arch/arm/mach-kirkwood/board-goflexnet.c                     |    2 +-
 arch/arm/mach-kirkwood/common.c                              |   10 +++++-----
 arch/arm/mach-kirkwood/d2net_v2-setup.c                      |    2 +-
 arch/arm/mach-kirkwood/db88f6281-bp-setup.c                  |    2 +-
 arch/arm/mach-kirkwood/dockstar-setup.c                      |    2 +-
 arch/arm/mach-kirkwood/guruplug-setup.c                      |    2 +-
 arch/arm/mach-kirkwood/netspace_v2-setup.c                   |    2 +-
 arch/arm/mach-kirkwood/netxbig_v2-setup.c                    |    2 +-
 arch/arm/mach-kirkwood/openrd-setup.c                        |    2 +-
 arch/arm/mach-kirkwood/rd88f6281-setup.c                     |    2 +-
 arch/arm/mach-kirkwood/sheevaplug-setup.c                    |    2 +-
 arch/arm/mach-mv78xx0/common.c                               |    4 ++--
 arch/arm/mach-orion5x/common.c                               |    4 ++--
 arch/arm/mach-orion5x/db88f5281-setup.c                      |    2 +-
 arch/arm/mach-orion5x/kurobox_pro-setup.c                    |    2 +-
 arch/arm/plat-orion/common.c                                 |    4 ++--
 drivers/dma/mv_xor.c                                         |    2 +-
 drivers/leds/leds-netxbig.c                                  |    2 +-
 drivers/leds/leds-ns2.c                                      |    2 +-
 drivers/mmc/host/mvsdio.c                                    |    2 +-
 drivers/mtd/nand/orion_nand.c                                |    2 +-
 drivers/usb/host/ehci-orion.c                                |    2 +-
 .../audio.h => include/linux/platform_data/asoc-kirkwood.h   |    0
 .../mv_xor.h => include/linux/platform_data/dma-mv_xor.h     |    0
 .../linux/platform_data/leds-kirkwood-netxbig.h              |    0
 .../linux/platform_data/leds-kirkwood-ns2.h                  |    0
 .../mvsdio.h => include/linux/platform_data/mmc-mvsdio.h     |    0
 .../linux/platform_data/mtd-orion_nand.h                     |    0
 .../linux/platform_data/usb-ehci-orion.h                     |    0
 sound/soc/kirkwood/kirkwood-i2s.c                            |    2 +-
 sound/soc/kirkwood/kirkwood-openrd.c                         |    2 +-
 sound/soc/kirkwood/kirkwood-t5325.c                          |    2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)
 rename arch/arm/plat-orion/include/plat/audio.h => include/linux/platform_data/asoc-kirkwood.h (100%)
 rename arch/arm/plat-orion/include/plat/mv_xor.h => include/linux/platform_data/dma-mv_xor.h (100%)
 rename arch/arm/mach-kirkwood/include/mach/leds-netxbig.h => include/linux/platform_data/leds-kirkwood-netxbig.h (100%)
 rename arch/arm/mach-kirkwood/include/mach/leds-ns2.h => include/linux/platform_data/leds-kirkwood-ns2.h (100%)
 rename arch/arm/plat-orion/include/plat/mvsdio.h => include/linux/platform_data/mmc-mvsdio.h (100%)
 rename arch/arm/plat-orion/include/plat/orion_nand.h => include/linux/platform_data/mtd-orion_nand.h (100%)
 rename arch/arm/plat-orion/include/plat/ehci-orion.h => include/linux/platform_data/usb-ehci-orion.h (100%)
arch/arm/mach-dove/common.c +1 -1
index 4db5de5..29d63fa 100644
@@ -28,7 +28,7 @@
 #include <asm/mach/arch.h>
 #include <linux/irq.h>
 #include <plat/time.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/usb-ehci-orion.h>
 #include <plat/common.h>
 #include <plat/addr-map.h>
 #include "common.h"
arch/arm/mach-kirkwood/board-dreamplug.c +1 -1
index aeb234d..20af53a 100644
@@ -30,7 +30,7 @@
 #include <asm/mach/map.h>
 #include <mach/kirkwood.h>
 #include <mach/bridge-regs.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"
arch/arm/mach-kirkwood/board-goflexnet.c +1 -1
index 413e2c8..001ca8c 100644
@@ -32,7 +32,7 @@
 #include <asm/mach/map.h>
 #include <mach/kirkwood.h>
 #include <mach/bridge-regs.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"
arch/arm/mach-kirkwood/common.c +5 -5
index c4b64ad..bd5ea69 100644
@@ -26,15 +26,15 @@
 #include <asm/mach/time.h>
 #include <mach/kirkwood.h>
 #include <mach/bridge-regs.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-kirkwood.h>
 #include <plat/cache-feroceon-l2.h>
-#include <plat/mvsdio.h>
-#include <plat/orion_nand.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/mmc-mvsdio.h>
+#include <linux/platform_data/mtd-orion_nand.h>
+#include <linux/platform_data/usb-ehci-orion.h>
 #include <plat/common.h>
 #include <plat/time.h>
 #include <plat/addr-map.h>
-#include <plat/mv_xor.h>
+#include <linux/platform_data/dma-mv_xor.h>
 #include "common.h"
 
 /*****************************************************************************
arch/arm/mach-kirkwood/d2net_v2-setup.c +1 -1
index 6e1bac9..2c1a453 100644
@@ -32,7 +32,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <mach/leds-ns2.h>
+#include <linux/platform_data/leds-kirkwood-ns2.h>
 #include "common.h"
 #include "mpp.h"
 #include "lacie_v2-common.h"
arch/arm/mach-kirkwood/db88f6281-bp-setup.c +1 -1
index d933593..044a631c 100644
@@ -17,7 +17,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"
arch/arm/mach-kirkwood/dockstar-setup.c +1 -1
index 61d9a55..23dcb19 100644
@@ -19,7 +19,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"
arch/arm/mach-kirkwood/guruplug-setup.c +1 -1
index bdaed38..7cb55f9 100644
@@ -19,7 +19,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"
arch/arm/mach-kirkwood/netspace_v2-setup.c +1 -1
index e6bba01..88b0788 100644
@@ -34,7 +34,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <mach/leds-ns2.h>
+#include <linux/platform_data/leds-kirkwood-ns2.h>
 #include "common.h"
 #include "mpp.h"
 #include "lacie_v2-common.h"
arch/arm/mach-kirkwood/netxbig_v2-setup.c +1 -1
index 31ae8de..a3b0914 100644
@@ -32,7 +32,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <mach/leds-netxbig.h>
+#include <linux/platform_data/leds-kirkwood-netxbig.h>
 #include "common.h"
 #include "mpp.h"
 #include "lacie_v2-common.h"
arch/arm/mach-kirkwood/openrd-setup.c +1 -1
index 7e99c3f..134ef50 100644
@@ -20,7 +20,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"
arch/arm/mach-kirkwood/rd88f6281-setup.c +1 -1
index ef92207..9717101 100644
@@ -20,7 +20,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"
arch/arm/mach-kirkwood/sheevaplug-setup.c +1 -1
index 4ea70e5f..28d0aba 100644
@@ -19,7 +19,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"
arch/arm/mach-mv78xx0/common.c +2 -2
index b4c53b8..26de7f4 100644
@@ -20,8 +20,8 @@
 #include <mach/mv78xx0.h>
 #include <mach/bridge-regs.h>
 #include <plat/cache-feroceon-l2.h>
-#include <plat/ehci-orion.h>
-#include <plat/orion_nand.h>
+#include <linux/platform_data/usb-ehci-orion.h>
+#include <linux/platform_data/mtd-orion_nand.h>
 #include <plat/time.h>
 #include <plat/common.h>
 #include <plat/addr-map.h>
arch/arm/mach-orion5x/common.c +2 -2
index 9148b22..ca67e82 100644
@@ -30,8 +30,8 @@
 #include <mach/bridge-regs.h>
 #include <mach/hardware.h>
 #include <mach/orion5x.h>
-#include <plat/orion_nand.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/mtd-orion_nand.h>
+#include <linux/platform_data/usb-ehci-orion.h>
 #include <plat/time.h>
 #include <plat/common.h>
 #include <plat/addr-map.h>
arch/arm/mach-orion5x/db88f5281-setup.c +1 -1
index 49a3fd6..41fe2b1 100644
@@ -24,7 +24,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
 #include <mach/orion5x.h>
-#include <plat/orion_nand.h>
+#include <linux/platform_data/mtd-orion_nand.h>
 #include "common.h"
 #include "mpp.h"
arch/arm/mach-orion5x/kurobox_pro-setup.c +1 -1
index 1e458ef..f1ae10a 100644
@@ -24,7 +24,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
 #include <mach/orion5x.h>
-#include <plat/orion_nand.h>
+#include <linux/platform_data/mtd-orion_nand.h>
 #include "common.h"
 #include "mpp.h"
arch/arm/plat-orion/common.c +2 -2
index d245a87..9148eb0 100644
@@ -19,8 +19,8 @@
 #include <linux/mv643xx_eth.h>
 #include <linux/mv643xx_i2c.h>
 #include <net/dsa.h>
-#include <plat/mv_xor.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/dma-mv_xor.h>
+#include <linux/platform_data/usb-ehci-orion.h>
 #include <mach/bridge-regs.h>
 
 /* Create a clkdev entry for a given device/clk */
drivers/dma/mv_xor.c +1 -1
index 0b12e68..e362e2b 100644
@@ -26,7 +26,7 @@
 #include <linux/platform_device.h>
 #include <linux/memory.h>
 #include <linux/clk.h>
-#include <plat/mv_xor.h>
+#include <linux/platform_data/dma-mv_xor.h>
 
 #include "dmaengine.h"
 #include "mv_xor.h"
drivers/leds/leds-netxbig.c +1 -1
index e37618e..461bbf9 100644
@@ -28,7 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/leds.h>
-#include <mach/leds-netxbig.h>
+#include <linux/platform_data/leds-kirkwood-netxbig.h>
 
 /*
  * GPIO extension bus.
drivers/leds/leds-ns2.c +1 -1
index 10528da..d176ec8 100644
@@ -29,7 +29,7 @@
 #include <linux/gpio.h>
 #include <linux/leds.h>
 #include <linux/module.h>
-#include <mach/leds-ns2.h>
+#include <linux/platform_data/leds-kirkwood-ns2.h>
 
 /*
  * The Network Space v2 dual-GPIO LED is wired to a CPLD and can blink in
drivers/mmc/host/mvsdio.c +1 -1
index a61cb5f..de4c20b 100644
@@ -25,7 +25,7 @@
 
 #include <asm/sizes.h>
 #include <asm/unaligned.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 
 #include "mvsdio.h"
drivers/mtd/nand/orion_nand.c +1 -1
index fc5a868..131b58a 100644
@@ -22,7 +22,7 @@
 #include <asm/io.h>
 #include <asm/sizes.h>
 #include <mach/hardware.h>
-#include <plat/orion_nand.h>
+#include <linux/platform_data/mtd-orion_nand.h>
 
 static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 {
drivers/usb/host/ehci-orion.c +1 -1
index 8892d36..8e7eca6 100644
@@ -13,7 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/mbus.h>
 #include <linux/clk.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/usb-ehci-orion.h>
 
 #define rdl(off)	__raw_readl(hcd->regs + (off))
 #define wrl(off, val)	__raw_writel((val), hcd->regs + (off))
include/linux/platform_data/asoc-kirkwood.h renamed from arch/arm/plat-orion/include/plat/audio.h +0 -0
similarity index 100%
rename from arch/arm/plat-orion/include/plat/audio.h
rename to include/linux/platform_data/asoc-kirkwood.h
include/linux/platform_data/dma-mv_xor.h renamed from arch/arm/plat-orion/include/plat/mv_xor.h +0 -0
similarity index 100%
rename from arch/arm/plat-orion/include/plat/mv_xor.h
rename to include/linux/platform_data/dma-mv_xor.h
include/linux/platform_data/leds-kirkwood-netxbig.h renamed from arch/arm/mach-kirkwood/include/mach/leds-netxbig.h +0 -0
similarity index 100%
rename from arch/arm/mach-kirkwood/include/mach/leds-netxbig.h
rename to include/linux/platform_data/leds-kirkwood-netxbig.h
include/linux/platform_data/leds-kirkwood-ns2.h renamed from arch/arm/mach-kirkwood/include/mach/leds-ns2.h +0 -0
similarity index 100%
rename from arch/arm/mach-kirkwood/include/mach/leds-ns2.h
rename to include/linux/platform_data/leds-kirkwood-ns2.h
include/linux/platform_data/mmc-mvsdio.h renamed from arch/arm/plat-orion/include/plat/mvsdio.h +0 -0
similarity index 100%
rename from arch/arm/plat-orion/include/plat/mvsdio.h
rename to include/linux/platform_data/mmc-mvsdio.h
include/linux/platform_data/mtd-orion_nand.h renamed from arch/arm/plat-orion/include/plat/orion_nand.h +0 -0
similarity index 100%
rename from arch/arm/plat-orion/include/plat/orion_nand.h
rename to include/linux/platform_data/mtd-orion_nand.h
include/linux/platform_data/usb-ehci-orion.h renamed from arch/arm/plat-orion/include/plat/ehci-orion.h +0 -0
similarity index 100%
rename from arch/arm/plat-orion/include/plat/ehci-orion.h
rename to include/linux/platform_data/usb-ehci-orion.h
sound/soc/kirkwood/kirkwood-i2s.c +1 -1
index 7646dd7..542538d 100644
@@ -21,7 +21,7 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-kirkwood.h>
 #include "kirkwood.h"
 
 #define DRV_NAME	"kirkwood-i2s"
sound/soc/kirkwood/kirkwood-openrd.c +1 -1
index 80bd59c..c28540a 100644
@@ -17,7 +17,7 @@
 #include <linux/slab.h>
 #include <sound/soc.h>
 #include <mach/kirkwood.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-kirkwood.h>
 #include <asm/mach-types.h>
 #include "../codecs/cs42l51.h"
sound/soc/kirkwood/kirkwood-t5325.c +1 -1
index f898363..c67bbc5 100644
@@ -16,7 +16,7 @@
 #include <linux/slab.h>
 #include <sound/soc.h>
 #include <mach/kirkwood.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-kirkwood.h>
 #include <asm/mach-types.h>
 #include "../codecs/alc5623.h"
Signature · 1 line
1.7.10
#68 lore raw

Re: [PATCH 14/16] ARM: orion: move platform_data definitions

Hello Arnd,

Le Tue, 11 Sep 2012 15:02:37 +0200,
Arnd Bergmann <[email protected]> a ?crit :

Quoted 5 lines

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 orion include directories

I have already posted patches for this during the ARM summit, see:
http://lists.infradead.org/pipermail/linux-arm-kernel/2012-August/116380.html.

They have been applied by the Marvell maintainer Jason Cooper and are scheduled for 3.7, see
http://lists.infradead.org/pipermail/linux-arm-kernel/2012-August/116432.html.

Best regards,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
author
#69 lore raw

PATCH 15/16 ARM: samsung: move platform_data definitions

In reply to Arnd Bergmann

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 <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Mark Brown <[email protected]>
Cc Jeff Garzik <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc "Wolfram Sang (embedded platforms)" <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Bryan Wu <[email protected]>
Cc Richard Purdie <[email protected]>
Cc Sylwester Nawrocki <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Chris Ball <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Grant Likely <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Alan Stern <[email protected]>
Cc Sangbeom Kim <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc linux-samsung-soc at vger.kernel.org
---
 arch/arm/mach-exynos/dev-audio.c                   |    2 +-
 arch/arm/mach-exynos/dev-ohci.c                    |    2 +-
 arch/arm/mach-exynos/mach-nuri.c                   |    6 +++---
 arch/arm/mach-exynos/mach-origen.c                 |    6 +++---
 arch/arm/mach-exynos/mach-smdk4x12.c               |    2 +-
 arch/arm/mach-exynos/mach-smdkv310.c               |    6 +++---
 arch/arm/mach-exynos/mach-universal_c210.c         |    4 ++--
 arch/arm/mach-exynos/setup-i2c0.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c1.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c2.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c3.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c4.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c5.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c6.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c7.c                  |    2 +-
 arch/arm/mach-s3c24xx/common-smdk.c                |    4 ++--
 arch/arm/mach-s3c24xx/mach-amlm5900.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-anubis.c                |    6 +++---
 arch/arm/mach-s3c24xx/mach-at2440evb.c             |    6 +++---
 arch/arm/mach-s3c24xx/mach-bast.c                  |    8 ++++----
 arch/arm/mach-s3c24xx/mach-gta02.c                 |   10 +++++-----
 arch/arm/mach-s3c24xx/mach-h1940.c                 |    8 ++++----
 arch/arm/mach-s3c24xx/mach-jive.c                  |    6 +++---
 arch/arm/mach-s3c24xx/mach-mini2440.c              |   10 +++++-----
 arch/arm/mach-s3c24xx/mach-n30.c                   |    8 ++++----
 arch/arm/mach-s3c24xx/mach-nexcoder.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-osiris.c                |    4 ++--
 arch/arm/mach-s3c24xx/mach-otom.c                  |    2 +-
 arch/arm/mach-s3c24xx/mach-qt2410.c                |    8 ++++----
 arch/arm/mach-s3c24xx/mach-rx1950.c                |   10 +++++-----
 arch/arm/mach-s3c24xx/mach-rx3715.c                |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2410.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2413.c              |    4 ++--
 arch/arm/mach-s3c24xx/mach-smdk2416.c              |    8 ++++----
 arch/arm/mach-s3c24xx/mach-smdk2440.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2443.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-tct_hammer.c            |    2 +-
 arch/arm/mach-s3c24xx/mach-vr1000.c                |    6 +++---
 arch/arm/mach-s3c24xx/mach-vstms.c                 |    4 ++--
 arch/arm/mach-s3c24xx/setup-i2c.c                  |    2 +-
 arch/arm/mach-s3c24xx/simtec-audio.c               |    2 +-
 arch/arm/mach-s3c24xx/simtec-usb.c                 |    2 +-
 arch/arm/mach-s3c64xx/dev-audio.c                  |    2 +-
 arch/arm/mach-s3c64xx/mach-anw6410.c               |    2 +-
 arch/arm/mach-s3c64xx/mach-crag6410-module.c       |    2 +-
 arch/arm/mach-s3c64xx/mach-crag6410.c              |    4 ++--
 arch/arm/mach-s3c64xx/mach-hmt.c                   |    4 ++--
 arch/arm/mach-s3c64xx/mach-mini6410.c              |    4 ++--
 arch/arm/mach-s3c64xx/mach-ncp.c                   |    2 +-
 arch/arm/mach-s3c64xx/mach-real6410.c              |    4 ++--
 arch/arm/mach-s3c64xx/mach-smartq.c                |    8 ++++----
 arch/arm/mach-s3c64xx/mach-smdk6400.c              |    2 +-
 arch/arm/mach-s3c64xx/mach-smdk6410.c              |    6 +++---
 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-s5p64x0/dev-audio.c                  |    2 +-
 arch/arm/mach-s5p64x0/mach-smdk6440.c              |    4 ++--
 arch/arm/mach-s5p64x0/mach-smdk6450.c              |    4 ++--
 arch/arm/mach-s5p64x0/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5p64x0/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pc100/dev-audio.c                  |    2 +-
 arch/arm/mach-s5pc100/mach-smdkc100.c              |    8 ++++----
 arch/arm/mach-s5pc100/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5pc100/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pv210/dev-audio.c                  |    2 +-
 arch/arm/mach-s5pv210/mach-goni.c                  |    2 +-
 arch/arm/mach-s5pv210/mach-smdkc110.c              |    4 ++--
 arch/arm/mach-s5pv210/mach-smdkv210.c              |    6 +++---
 arch/arm/mach-s5pv210/mach-torbreck.c              |    2 +-
 arch/arm/mach-s5pv210/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5pv210/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pv210/setup-i2c2.c                 |    2 +-
 arch/arm/plat-samsung/devs.c                       |   20 ++++++++++----------
 drivers/ata/pata_samsung_cf.c                      |    2 +-
 drivers/hwmon/s3c-hwmon.c                          |    2 +-
 drivers/i2c/busses/i2c-s3c2410.c                   |    2 +-
 drivers/input/touchscreen/s3c2410_ts.c             |    2 +-
 drivers/leds/leds-s3c24xx.c                        |    2 +-
 drivers/media/video/s5p-fimc/mipi-csis.c           |    2 +-
 drivers/mmc/host/s3cmci.c                          |    2 +-
 drivers/mtd/nand/s3c2410.c                         |    2 +-
 drivers/spi/spi-s3c64xx.c                          |    2 +-
 drivers/usb/gadget/s3c2410_udc.c                   |    2 +-
 drivers/usb/host/ehci-s5p.c                        |    2 +-
 drivers/usb/host/ohci-exynos.c                     |    2 +-
 drivers/usb/host/ohci-s3c2410.c                    |    2 +-
 .../linux/platform_data/asoc-s3c.h                 |    0
 .../linux/platform_data/asoc-s3c24xx_simtec.h      |    0
 .../linux/platform_data/ata-samsung_cf.h           |    0
 .../linux/platform_data/hwmon-s3c.h                |    0
 .../linux/platform_data/i2c-s3c2410.h              |    0
 .../linux/platform_data/leds-s3c24xx.h             |    0
 .../linux/platform_data/mipi-csis.h                |    0
 .../linux/platform_data/mmc-s3cmci.h               |    0
 .../linux/platform_data/mtd-nand-s3c2410.h         |    0
 .../linux/platform_data/spi-s3c64xx.h              |    0
 .../linux/platform_data/touchscreen-s3c2410.h      |    0
 .../linux/platform_data/usb-ehci-s5p.h             |    0
 .../linux/platform_data/usb-exynos.h               |    0
 .../linux/platform_data/usb-ohci-s3c2410.h         |    0
 .../linux/platform_data/usb-s3c2410_udc.h          |    0
 sound/soc/samsung/ac97.c                           |    2 +-
 sound/soc/samsung/i2s.c                            |    2 +-
 sound/soc/samsung/pcm.c                            |    2 +-
 sound/soc/samsung/s3c24xx_simtec.c                 |    2 +-
 sound/soc/samsung/spdif.c                          |    2 +-
 107 files changed, 164 insertions(+), 164 deletions(-)
 rename arch/arm/plat-samsung/include/plat/audio.h => include/linux/platform_data/asoc-s3c.h (100%)
 rename arch/arm/plat-samsung/include/plat/audio-simtec.h => include/linux/platform_data/asoc-s3c24xx_simtec.h (100%)
 rename arch/arm/plat-samsung/include/plat/ata.h => include/linux/platform_data/ata-samsung_cf.h (100%)
 rename arch/arm/plat-samsung/include/plat/hwmon.h => include/linux/platform_data/hwmon-s3c.h (100%)
 rename arch/arm/plat-samsung/include/plat/iic.h => include/linux/platform_data/i2c-s3c2410.h (100%)
 rename arch/arm/mach-s3c24xx/include/mach/leds-gpio.h => include/linux/platform_data/leds-s3c24xx.h (100%)
 rename arch/arm/plat-samsung/include/plat/mipi_csis.h => include/linux/platform_data/mipi-csis.h (100%)
 rename arch/arm/plat-samsung/include/plat/mci.h => include/linux/platform_data/mmc-s3cmci.h (100%)
 rename arch/arm/plat-samsung/include/plat/nand.h => include/linux/platform_data/mtd-nand-s3c2410.h (100%)
 rename arch/arm/plat-samsung/include/plat/s3c64xx-spi.h => include/linux/platform_data/spi-s3c64xx.h (100%)
 rename arch/arm/plat-samsung/include/plat/ts.h => include/linux/platform_data/touchscreen-s3c2410.h (100%)
 rename arch/arm/plat-samsung/include/plat/ehci.h => include/linux/platform_data/usb-ehci-s5p.h (100%)
 rename arch/arm/mach-exynos/include/mach/ohci.h => include/linux/platform_data/usb-exynos.h (100%)
 rename arch/arm/plat-samsung/include/plat/usb-control.h => include/linux/platform_data/usb-ohci-s3c2410.h (100%)
 rename arch/arm/plat-samsung/include/plat/udc.h => include/linux/platform_data/usb-s3c2410_udc.h (100%)
arch/arm/mach-exynos/dev-audio.c +1 -1
index b33a5b6..ae321c7 100644
@@ -16,7 +16,7 @@
 #include <linux/gpio.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include <mach/map.h>
 #include <mach/dma.h>
arch/arm/mach-exynos/dev-ohci.c +1 -1
index b8e7530..14ed795 100644
@@ -15,7 +15,7 @@
 
 #include <mach/irqs.h>
 #include <mach/map.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/usb-exynos.h>
 
 #include <plat/devs.h>
 #include <plat/usb-phy.h>
arch/arm/mach-exynos/mach-nuri.c +3 -3
index ea785fc..393d2ce 100644
@@ -45,14 +45,14 @@
 #include <plat/devs.h>
 #include <plat/fb.h>
 #include <plat/sdhci.h>
-#include <plat/ehci.h>
+#include <linux/platform_data/usb-ehci-s5p.h>
 #include <plat/clock.h>
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/mfc.h>
 #include <plat/fimc-core.h>
 #include <plat/camport.h>
-#include <plat/mipi_csis.h>
+#include <linux/platform_data/mipi-csis.h>
 
 #include <mach/map.h>
arch/arm/mach-exynos/mach-origen.c +3 -3
index 5ca8030..4a531dc 100644
@@ -35,15 +35,15 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/sdhci.h>
-#include <plat/iic.h>
-#include <plat/ehci.h>
+#include <linux/platform_data/i2c-s3c2410.h>
+#include <linux/platform_data/usb-ehci-s5p.h>
 #include <plat/clock.h>
 #include <plat/gpio-cfg.h>
 #include <plat/backlight.h>
 #include <plat/fb.h>
 #include <plat/mfc.h>
 
-#include <mach/ohci.h>
+#include <linux/platform_data/usb-exynos.h>
 #include <mach/map.h>
 
 #include <drm/exynos_drm.h>
arch/arm/mach-exynos/mach-smdk4x12.c +1 -1
index b26beb1..6a791fd 100644
@@ -32,7 +32,7 @@
 #include <plat/devs.h>
 #include <plat/fb.h>
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/keypad.h>
 #include <plat/mfc.h>
 #include <plat/regs-fb.h>
arch/arm/mach-exynos/mach-smdkv310.c +3 -3
index 3cfa688..fa2ada6 100644
@@ -34,15 +34,15 @@
 #include <plat/fb.h>
 #include <plat/keypad.h>
 #include <plat/sdhci.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 #include <plat/backlight.h>
 #include <plat/mfc.h>
-#include <plat/ehci.h>
+#include <linux/platform_data/usb-ehci-s5p.h>
 #include <plat/clock.h>
 
 #include <mach/map.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/usb-exynos.h>
 
 #include <drm/exynos_drm.h>
 #include "common.h"
arch/arm/mach-exynos/mach-universal_c210.c +2 -2
index 4d1f40d..bc49e5a 100644
@@ -34,7 +34,7 @@
 #include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 #include <plat/fb.h>
 #include <plat/mfc.h>

@@ -43,7 +43,7 @@
 #include <plat/fimc-core.h>
 #include <plat/s5p-time.h>
 #include <plat/camport.h>
-#include <plat/mipi_csis.h>
+#include <linux/platform_data/mipi-csis.h>
 
 #include <mach/map.h>
arch/arm/mach-exynos/setup-i2c0.c +1 -1
index b90d94c..5700f23 100644
@@ -14,7 +14,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 #include <plat/cpu.h>
arch/arm/mach-exynos/setup-i2c1.c +1 -1
index fd7235a..8d2279c 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c1_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c2.c +1 -1
index 2694b19..0ed62fc 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c2_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c3.c +1 -1
index 379bd30..7787fd2 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c3_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c4.c +1 -1
index 9f3c048..edc847f 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c4_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c5.c +1 -1
index 77e1a1e..d88af7f 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c5_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c6.c +1 -1
index 284d12b..c590286 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c6_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c7.c +1 -1
index b7611ee..1bba755 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c7_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s3c24xx/common-smdk.c +2 -2
index 87e75a2..3b2cf6d 100644
@@ -37,9 +37,9 @@
 #include <asm/irq.h>
 
 #include <mach/regs-gpio.h>
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 
 #include <plat/common-smdk.h>
 #include <plat/gpio-cfg.h>
arch/arm/mach-s3c24xx/mach-amlm5900.c +1 -1
index ea2c4b00..f4ad99c 100644
@@ -53,7 +53,7 @@
 #include <mach/regs-lcd.h>
 #include <mach/regs-gpio.h>
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/gpio-cfg.h>
arch/arm/mach-s3c24xx/mach-anubis.c +3 -3
index 5a7d0c0..df890fb 100644
@@ -40,8 +40,8 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>

@@ -53,7 +53,7 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/audio-simtec.h>
+#include <linux/platform_data/asoc-s3c24xx_simtec.h>
 
 #include "simtec.h"
 #include "common.h"
arch/arm/mach-s3c24xx/mach-at2440evb.c +3 -3
index 7a05abf..00381fe 100644
@@ -36,8 +36,8 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>

@@ -47,7 +47,7 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/mci.h>
+#include <linux/platform_data/mmc-s3cmci.h>
 
 #include "common.h"
arch/arm/mach-s3c24xx/mach-bast.c +4 -4
index 1cf1720..6a30ce7 100644
@@ -45,9 +45,9 @@
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
 
-#include <plat/hwmon.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/hwmon-s3c.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <mach/fb.h>
 
 #include <linux/mtd/mtd.h>

@@ -62,7 +62,7 @@
 #include <plat/cpu.h>
 #include <plat/cpu-freq.h>
 #include <plat/gpio-cfg.h>
-#include <plat/audio-simtec.h>
+#include <linux/platform_data/asoc-s3c24xx_simtec.h>
 
 #include "simtec.h"
 #include "common.h"
arch/arm/mach-s3c24xx/mach-gta02.c +5 -5
index 92e1f93..4a96346 100644
@@ -73,21 +73,21 @@
 #include <mach/regs-gpio.h>
 #include <mach/fb.h>
 
-#include <plat/usb-control.h>
+#include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <mach/regs-mem.h>
 #include <mach/hardware.h>
 
 #include <mach/gta02.h>
 
 #include <plat/regs-serial.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>
-#include <plat/udc.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
-#include <plat/ts.h>
+#include <linux/platform_data/i2c-s3c2410.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 
 #include "common.h"
arch/arm/mach-s3c24xx/mach-h1940.c +4 -4
index bb8d008..9638b33 100644
@@ -56,8 +56,8 @@
 #include <mach/h1940.h>
 #include <mach/h1940-latch.h>
 #include <mach/fb.h>
-#include <plat/udc.h>
-#include <plat/iic.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/gpio-cfg.h>
 #include <plat/clock.h>

@@ -65,8 +65,8 @@
 #include <plat/cpu.h>
 #include <plat/pll.h>
 #include <plat/pm.h>
-#include <plat/mci.h>
-#include <plat/ts.h>
+#include <linux/platform_data/mmc-s3cmci.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 
 #include <sound/uda1380.h>
arch/arm/mach-s3c24xx/mach-jive.c +3 -3
index ae73ba3..28ad25b 100644
@@ -32,8 +32,8 @@
 #include <asm/mach/irq.h>
 
 #include <plat/regs-serial.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <mach/regs-power.h>
 #include <mach/regs-gpio.h>

@@ -54,7 +54,7 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>
-#include <plat/udc.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
 
 static struct map_desc jive_iodesc[] __initdata = {
 };
arch/arm/mach-s3c24xx/mach-mini2440.c +5 -5
index bd6d252..c676b8e 100644
@@ -39,14 +39,14 @@
 
 #include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
 #include <mach/irqs.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
-#include <plat/mci.h>
-#include <plat/udc.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/mtd/mtd.h>
 #include <linux/mtd/nand.h>
arch/arm/mach-s3c24xx/mach-n30.c +4 -4
index 383d00c..c53a9bf 100644
@@ -33,7 +33,7 @@
 #include <asm/mach-types.h>
 
 #include <mach/fb.h>
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
 

@@ -41,15 +41,15 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/regs-serial.h>
 
 #include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/mci.h>
+#include <linux/platform_data/mmc-s3cmci.h>
 #include <plat/s3c2410.h>
-#include <plat/udc.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
 
 #include "common.h"
arch/arm/mach-s3c24xx/mach-nexcoder.c +1 -1
index 5c05ba1..7841321 100644
@@ -38,7 +38,7 @@
 //#include <asm/debug-ll.h>
 #include <mach/regs-gpio.h>
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/gpio-cfg.h>
 #include <plat/s3c2410.h>
arch/arm/mach-s3c24xx/mach-osiris.c +2 -2
index 95d0772..63c20019 100644
@@ -41,8 +41,8 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
arch/arm/mach-s3c24xx/mach-otom.c +1 -1
index bc4b6ef..bca39f0 100644
@@ -35,7 +35,7 @@
 #include <plat/s3c2410.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/cpu.h>
 
 #include "common.h"
arch/arm/mach-s3c24xx/mach-qt2410.c +4 -4
index 678bbca..7b6ba13 100644
@@ -47,13 +47,13 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 #include <mach/regs-lcd.h>
 #include <plat/regs-serial.h>
 #include <mach/fb.h>
-#include <plat/nand.h>
-#include <plat/udc.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/common-smdk.h>
 #include <plat/gpio-cfg.h>
arch/arm/mach-s3c24xx/mach-rx1950.c +5 -5
index 7ee73f2..379fde5 100644
@@ -49,15 +49,15 @@
 #include <plat/clock.h>
 #include <plat/regs-serial.h>
 #include <plat/regs-iic.h>
-#include <plat/mci.h>
-#include <plat/udc.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mmc-s3cmci.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>
 #include <plat/irq.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 
 #include <sound/uda1380.h>
arch/arm/mach-s3c24xx/mach-rx3715.c +1 -1
index 56af354..dacbb9a 100644
@@ -43,7 +43,7 @@
 #include <mach/regs-lcd.h>
 
 #include <mach/h1940.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <mach/fb.h>
 
 #include <plat/clock.h>
arch/arm/mach-s3c24xx/mach-smdk2410.c +1 -1
index bdc27e7..82796b9 100644
@@ -47,7 +47,7 @@
 #include <asm/mach-types.h>
 
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/devs.h>
 #include <plat/cpu.h>
arch/arm/mach-s3c24xx/mach-smdk2413.c +2 -2
index b11451b..ce99fd8 100644
@@ -38,8 +38,8 @@
 #include <mach/regs-lcd.h>
 
 #include <mach/idle.h>
-#include <plat/udc.h>
-#include <plat/iic.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <mach/fb.h>
 
 #include <plat/s3c2410.h>
arch/arm/mach-s3c24xx/mach-smdk2416.c +4 -4
index c3100a0..db2787a 100644
@@ -39,17 +39,17 @@
 #include <mach/regs-s3c2443-clock.h>
 
 #include <mach/idle.h>
-#include <mach/leds-gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/leds-s3c24xx.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/s3c2416.h>
 #include <plat/gpio-cfg.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/sdhci.h>
-#include <plat/udc.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
 #include <linux/platform_data/s3c-hsudc.h>
 
 #include <plat/regs-fb-v4.h>
arch/arm/mach-s3c24xx/mach-smdk2440.c +1 -1
index 83a1036..b7ff882 100644
@@ -37,7 +37,7 @@
 
 #include <mach/idle.h>
 #include <mach/fb.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/s3c2410.h>
 #include <plat/s3c244x.h>
arch/arm/mach-s3c24xx/mach-smdk2443.c +1 -1
index 2092369..2568656 100644
@@ -37,7 +37,7 @@
 
 #include <mach/idle.h>
 #include <mach/fb.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/s3c2410.h>
 #include <plat/s3c2443.h>
arch/arm/mach-s3c24xx/mach-tct_hammer.c +1 -1
index fe99028..495bf5c 100644
@@ -45,7 +45,7 @@
 #include <asm/mach-types.h>
 
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
arch/arm/mach-s3c24xx/mach-vr1000.c +3 -3
index bd5f189..14d5b12 100644
@@ -43,13 +43,13 @@
 
 #include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/iic.h>
-#include <plat/audio-simtec.h>
+#include <linux/platform_data/i2c-s3c2410.h>
+#include <linux/platform_data/asoc-s3c24xx_simtec.h>
 
 #include "simtec.h"
 #include "common.h"
arch/arm/mach-s3c24xx/mach-vstms.c +2 -2
index 94bfaa1..f1d44ae 100644
@@ -39,8 +39,8 @@
 #include <mach/idle.h>
 #include <mach/fb.h>
 
-#include <plat/iic.h>
-#include <plat/nand.h>
+#include <linux/platform_data/i2c-s3c2410.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 
 #include <plat/s3c2410.h>
 #include <plat/s3c2412.h>
arch/arm/mach-s3c24xx/setup-i2c.c +1 -1
index 9e90a7c..7b4f333 100644
@@ -16,7 +16,7 @@
 struct platform_device;
 
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
arch/arm/mach-s3c24xx/simtec-audio.c +1 -1
index 11881c9..fd0ef05 100644
@@ -24,7 +24,7 @@
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
 
-#include <plat/audio-simtec.h>
+#include <linux/platform_data/asoc-s3c24xx_simtec.h>
 #include <plat/devs.h>
 
 #include "simtec.h"
arch/arm/mach-s3c24xx/simtec-usb.c +1 -1
index d91c1a7..17f8356 100644
@@ -34,7 +34,7 @@
 #include <mach/hardware.h>
 #include <asm/irq.h>
 
-#include <plat/usb-control.h>
+#include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <plat/devs.h>
 
 #include "simtec.h"
arch/arm/mach-s3c64xx/dev-audio.c +1 -1
index 124fd5d..35f3e07 100644
@@ -20,7 +20,7 @@
 #include <mach/dma.h>
 
 #include <plat/devs.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 #include <plat/gpio-cfg.h>
 
 static const char *rclksrc[] = {
arch/arm/mach-s3c64xx/mach-anw6410.c +1 -1
index ffa29dd..15c58df 100644
@@ -42,7 +42,7 @@
 #include <asm/mach-types.h>
 
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
 #include <plat/regs-fb-v4.h>
arch/arm/mach-s3c64xx/mach-crag6410-module.c +1 -1
index 9e382e7..181aa994 100644
@@ -24,7 +24,7 @@
 #include <sound/wm8962.h>
 #include <sound/wm9081.h>
 
-#include <plat/s3c64xx-spi.h>
+#include <linux/platform_data/spi-s3c64xx.h>
 
 #include <mach/crag6410.h>
arch/arm/mach-s3c64xx/mach-crag6410.c +2 -2
index 09cd812..717d675 100644
@@ -61,14 +61,14 @@
 #include <plat/fb.h>
 #include <plat/sdhci.h>
 #include <plat/gpio-cfg.h>
-#include <plat/s3c64xx-spi.h>
+#include <linux/platform_data/spi-s3c64xx.h>
 
 #include <plat/keypad.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/adc.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/pm.h>
 
 #include "common.h"
arch/arm/mach-s3c64xx/mach-hmt.c +2 -2
index 6890881..02222b3 100644
@@ -34,9 +34,9 @@
 #include <asm/mach-types.h>
 
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 
 #include <plat/clock.h>
 #include <plat/devs.h>
arch/arm/mach-s3c64xx/mach-mini6410.c +2 -2
index 5539a255..09311cc 100644
@@ -38,9 +38,9 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/fb.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/regs-serial.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/regs-fb-v4.h>
 
 #include <video/platform_lcd.h>
arch/arm/mach-s3c64xx/mach-ncp.c +1 -1
index cad2e05..46ee88d 100644
@@ -37,7 +37,7 @@
 #include <asm/mach-types.h>
 
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
 
 #include <plat/clock.h>
arch/arm/mach-s3c64xx/mach-real6410.c +2 -2
index 326b216..6daca20 100644
@@ -39,9 +39,9 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/fb.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/regs-serial.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/regs-fb-v4.h>
 
 #include <video/platform_lcd.h>
arch/arm/mach-s3c64xx/mach-smartq.c +4 -4
index ceeb1de..c6d7390 100644
@@ -30,13 +30,13 @@
 #include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
-#include <plat/hwmon.h>
+#include <linux/platform_data/hwmon-s3c.h>
 #include <plat/regs-serial.h>
-#include <plat/usb-control.h>
+#include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <plat/sdhci.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 
 #include <video/platform_lcd.h>
arch/arm/mach-s3c64xx/mach-smdk6400.c +1 -1
index b0f4525..a928fae 100644
@@ -35,7 +35,7 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include "common.h"
arch/arm/mach-s3c64xx/mach-smdk6410.c +3 -3
index 0fe4f15..2547a88 100644
@@ -60,8 +60,8 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-sys.h>
 #include <mach/regs-srom.h>
-#include <plat/ata.h>
-#include <plat/iic.h>
+#include <linux/platform_data/ata-samsung_cf.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
 #include <plat/gpio-cfg.h>
 

@@ -69,7 +69,7 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/adc.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/keypad.h>
 #include <plat/backlight.h>
 #include <plat/regs-fb-v4.h>
arch/arm/mach-s3c64xx/setup-i2c0.c +1 -1
index 241af94..40666ba 100644
@@ -18,7 +18,7 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c0_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s3c64xx/setup-i2c1.c +1 -1
index 3d13a96..3fdb24c 100644
@@ -18,7 +18,7 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c1_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s3c64xx/setup-ide.c +1 -1
index 41b4256..648d8b8 100644
@@ -17,7 +17,7 @@
 #include <mach/map.h>
 #include <mach/regs-clock.h>
 #include <plat/gpio-cfg.h>
-#include <plat/ata.h>
+#include <linux/platform_data/ata-samsung_cf.h>
 
 void s3c64xx_ide_setup_gpio(void)
 {
arch/arm/mach-s5p64x0/dev-audio.c +1 -1
index 91113dd..a0d6edf 100644
@@ -13,7 +13,7 @@
 #include <linux/gpio.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include <mach/map.h>
 #include <mach/dma.h>
arch/arm/mach-s5p64x0/mach-smdk6440.c +2 -2
index 92fefad..dea78a8 100644
@@ -45,10 +45,10 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/pll.h>
 #include <plat/adc.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/s5p-time.h>
 #include <plat/backlight.h>
 #include <plat/fb.h>
arch/arm/mach-s5p64x0/mach-smdk6450.c +2 -2
index e2335ec..6f14fc7 100644
@@ -45,10 +45,10 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/pll.h>
 #include <plat/adc.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/s5p-time.h>
 #include <plat/backlight.h>
 #include <plat/fb.h>
arch/arm/mach-s5p64x0/setup-i2c0.c +1 -1
index 46b4639..a32edc5 100644
@@ -19,7 +19,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <mach/i2c.h>
arch/arm/mach-s5p64x0/setup-i2c1.c +1 -1
index 6ad3b98..ca2c5c7 100644
@@ -19,7 +19,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <mach/i2c.h>
arch/arm/mach-s5pc100/dev-audio.c +1 -1
index 9d4bde3..1cc252c 100644
@@ -13,7 +13,7 @@
 #include <linux/gpio.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include <mach/map.h>
 #include <mach/dma.h>
arch/arm/mach-s5pc100/mach-smdkc100.c +4 -4
index 0c3ae38..5d2c093 100644
@@ -44,12 +44,12 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/fb.h>
-#include <plat/iic.h>
-#include <plat/ata.h>
+#include <linux/platform_data/i2c-s3c2410.h>
+#include <linux/platform_data/ata-samsung_cf.h>
 #include <plat/adc.h>
 #include <plat/keypad.h>
-#include <plat/ts.h>
-#include <plat/audio.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
+#include <linux/platform_data/asoc-s3c.h>
 #include <plat/backlight.h>
 #include <plat/regs-fb-v4.h>
arch/arm/mach-s5pc100/setup-i2c0.c +1 -1
index eaef7a3..89a6a76 100644
@@ -18,7 +18,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c0_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s5pc100/setup-i2c1.c +1 -1
index aaff74a..faa667e 100644
@@ -18,7 +18,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c1_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s5pv210/dev-audio.c +1 -1
index 8367749..0a5480b 100644
@@ -13,7 +13,7 @@
 #include <linux/gpio.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include <mach/map.h>
 #include <mach/dma.h>
arch/arm/mach-s5pv210/mach-goni.c +1 -1
index 822a559..00f1e47 100644
@@ -43,7 +43,7 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/fb.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/keypad.h>
 #include <plat/sdhci.h>
 #include <plat/clock.h>
arch/arm/mach-s5pv210/mach-smdkc110.c +2 -2
index dfc2923..d9c99fc 100644
@@ -27,8 +27,8 @@
 #include <plat/regs-serial.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/ata.h>
-#include <plat/iic.h>
+#include <linux/platform_data/ata-samsung_cf.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/pm.h>
 #include <plat/s5p-time.h>
 #include <plat/mfc.h>
arch/arm/mach-s5pv210/mach-smdkv210.c +3 -3
index 918b23d..7d6fab4 100644
@@ -38,9 +38,9 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/adc.h>
-#include <plat/ts.h>
-#include <plat/ata.h>
-#include <plat/iic.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
+#include <linux/platform_data/ata-samsung_cf.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/keypad.h>
 #include <plat/pm.h>
 #include <plat/fb.h>
arch/arm/mach-s5pv210/mach-torbreck.c +1 -1
index 74e99bc..18785cb 100644
@@ -26,7 +26,7 @@
 #include <plat/regs-serial.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/s5p-time.h>
 
 #include "common.h"
arch/arm/mach-s5pv210/setup-i2c0.c +1 -1
index 0f1cc3a..4a15849 100644
@@ -18,7 +18,7 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c0_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s5pv210/setup-i2c1.c +1 -1
index f61365a..4777f6b 100644
@@ -18,7 +18,7 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c1_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s5pv210/setup-i2c2.c +1 -1
index 2f91b5c..bbce6c7 100644
@@ -18,7 +18,7 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c2_cfg_gpio(struct platform_device *dev)
arch/arm/plat-samsung/devs.c +10 -10
index 74e31ce..07913ac 100644
@@ -46,24 +46,24 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/adc.h>
-#include <plat/ata.h>
-#include <plat/ehci.h>
+#include <linux/platform_data/ata-samsung_cf.h>
+#include <linux/platform_data/usb-ehci-s5p.h>
 #include <plat/fb.h>
 #include <plat/fb-s3c2410.h>
-#include <plat/hwmon.h>
-#include <plat/iic.h>
+#include <linux/platform_data/hwmon-s3c.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/keypad.h>
-#include <plat/mci.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mmc-s3cmci.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/sdhci.h>
-#include <plat/ts.h>
-#include <plat/udc.h>
-#include <plat/usb-control.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
+#include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <plat/usb-phy.h>
 #include <plat/regs-iic.h>
 #include <plat/regs-serial.h>
 #include <plat/regs-spi.h>
-#include <plat/s3c64xx-spi.h>
+#include <linux/platform_data/spi-s3c64xx.h>
 
 static u64 samsung_device_dma_mask = DMA_BIT_MASK(32);
drivers/ata/pata_samsung_cf.c +1 -1
index 1b372c2..63ffb00 100644
@@ -23,7 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
-#include <plat/ata.h>
+#include <linux/platform_data/ata-samsung_cf.h>
 #include <plat/regs-ata.h>
 
 #define DRV_NAME "pata_samsung_cf"
drivers/hwmon/s3c-hwmon.c +1 -1
index b7975f8..fe11b95 100644
@@ -34,7 +34,7 @@
 #include <linux/hwmon-sysfs.h>
 
 #include <plat/adc.h>
-#include <plat/hwmon.h>
+#include <linux/platform_data/hwmon-s3c.h>
 
 struct s3c_hwmon_attr {
 	struct sensor_device_attribute	in;
drivers/i2c/busses/i2c-s3c2410.c +1 -1
index 5ae3b02..4d07dea 100644
@@ -42,7 +42,7 @@
 #include <asm/irq.h>
 
 #include <plat/regs-iic.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 /* Treat S3C2410 as baseline hardware, anything else is supported via quirks */
 #define QUIRK_S3C2440		(1 << 0)
drivers/input/touchscreen/s3c2410_ts.c +1 -1
index bf1a064..df9e816 100644
@@ -37,7 +37,7 @@
 
 #include <plat/adc.h>
 #include <plat/regs-adc.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 
 #define TSC_SLEEP  (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))
drivers/leds/leds-s3c24xx.c +1 -1
index 942f0ea..e1a0df6 100644
@@ -21,7 +21,7 @@
 
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 
 /* our context */
drivers/media/video/s5p-fimc/mipi-csis.c +1 -1
index 2f73d9e..5e89843 100644
@@ -26,7 +26,7 @@
 #include <linux/spinlock.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-subdev.h>
-#include <plat/mipi_csis.h>
+#include <linux/platform_data/mipi-csis.h>
 #include "mipi-csis.h"
 
 static int debug;
drivers/mmc/host/s3cmci.c +1 -1
index bd5a5cc..4638dda 100644
@@ -27,7 +27,7 @@
 
 #include <mach/regs-sdi.h>
 
-#include <plat/mci.h>
+#include <linux/platform_data/mmc-s3cmci.h>
 
 #include "s3cmci.h"
drivers/mtd/nand/s3c2410.c +1 -1
index 91121f3..d804061 100644
@@ -46,7 +46,7 @@
 #include <asm/io.h>
 
 #include <plat/regs-nand.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 
 #ifdef CONFIG_MTD_NAND_S3C2410_HWECC
 static int hardware_ecc = 1;
drivers/spi/spi-s3c64xx.c +1 -1
index d1c8441f..0e2a022 100644
@@ -32,7 +32,7 @@
 #include <linux/of_gpio.h>
 
 #include <mach/dma.h>
-#include <plat/s3c64xx-spi.h>
+#include <linux/platform_data/spi-s3c64xx.h>
 
 #define MAX_SPI_PORTS		3
drivers/usb/gadget/s3c2410_udc.c +1 -1
index f2e51f5..f006045 100644
@@ -43,7 +43,7 @@
 #include <mach/hardware.h>
 
 #include <plat/regs-udc.h>
-#include <plat/udc.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
 
 
 #include "s3c2410_udc.h"
drivers/usb/host/ehci-s5p.c +1 -1
index 9d8f1dd..dfb14c7 100644
@@ -16,7 +16,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/of_gpio.h>
-#include <plat/ehci.h>
+#include <linux/platform_data/usb-ehci-s5p.h>
 #include <plat/usb-phy.h>
 
 #define EHCI_INSNREG00(base)			(base + 0x90)
drivers/usb/host/ohci-exynos.c +1 -1
index fc3091b..20a5008 100644
@@ -14,7 +14,7 @@
 #include <linux/clk.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/usb-exynos.h>
 #include <plat/usb-phy.h>
 
 struct exynos_ohci_hcd {
drivers/usb/host/ohci-s3c2410.c +1 -1
index 664c869..0d2309c 100644
@@ -21,7 +21,7 @@
 
 #include <linux/platform_device.h>
 #include <linux/clk.h>
-#include <plat/usb-control.h>
+#include <linux/platform_data/usb-ohci-s3c2410.h>
 
 #define valid_port(idx) ((idx) == 1 || (idx) == 2)
include/linux/platform_data/asoc-s3c.h renamed from arch/arm/plat-samsung/include/plat/audio.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/audio.h
rename to include/linux/platform_data/asoc-s3c.h
include/linux/platform_data/asoc-s3c24xx_simtec.h renamed from arch/arm/plat-samsung/include/plat/audio-simtec.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/audio-simtec.h
rename to include/linux/platform_data/asoc-s3c24xx_simtec.h
include/linux/platform_data/ata-samsung_cf.h renamed from arch/arm/plat-samsung/include/plat/ata.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/ata.h
rename to include/linux/platform_data/ata-samsung_cf.h
include/linux/platform_data/hwmon-s3c.h renamed from arch/arm/plat-samsung/include/plat/hwmon.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/hwmon.h
rename to include/linux/platform_data/hwmon-s3c.h
include/linux/platform_data/i2c-s3c2410.h renamed from arch/arm/plat-samsung/include/plat/iic.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/iic.h
rename to include/linux/platform_data/i2c-s3c2410.h
include/linux/platform_data/leds-s3c24xx.h renamed from arch/arm/mach-s3c24xx/include/mach/leds-gpio.h +0 -0
similarity index 100%
rename from arch/arm/mach-s3c24xx/include/mach/leds-gpio.h
rename to include/linux/platform_data/leds-s3c24xx.h
include/linux/platform_data/mipi-csis.h renamed from arch/arm/plat-samsung/include/plat/mipi_csis.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/mipi_csis.h
rename to include/linux/platform_data/mipi-csis.h
include/linux/platform_data/mmc-s3cmci.h renamed from arch/arm/plat-samsung/include/plat/mci.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/mci.h
rename to include/linux/platform_data/mmc-s3cmci.h
include/linux/platform_data/mtd-nand-s3c2410.h renamed from arch/arm/plat-samsung/include/plat/nand.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/nand.h
rename to include/linux/platform_data/mtd-nand-s3c2410.h
include/linux/platform_data/spi-s3c64xx.h renamed from arch/arm/plat-samsung/include/plat/s3c64xx-spi.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/s3c64xx-spi.h
rename to include/linux/platform_data/spi-s3c64xx.h
include/linux/platform_data/touchscreen-s3c2410.h renamed from arch/arm/plat-samsung/include/plat/ts.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/ts.h
rename to include/linux/platform_data/touchscreen-s3c2410.h
include/linux/platform_data/usb-ehci-s5p.h renamed from arch/arm/plat-samsung/include/plat/ehci.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/ehci.h
rename to include/linux/platform_data/usb-ehci-s5p.h
include/linux/platform_data/usb-exynos.h renamed from arch/arm/mach-exynos/include/mach/ohci.h +0 -0
similarity index 100%
rename from arch/arm/mach-exynos/include/mach/ohci.h
rename to include/linux/platform_data/usb-exynos.h
include/linux/platform_data/usb-ohci-s3c2410.h renamed from arch/arm/plat-samsung/include/plat/usb-control.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/usb-control.h
rename to include/linux/platform_data/usb-ohci-s3c2410.h
include/linux/platform_data/usb-s3c2410_udc.h renamed from arch/arm/plat-samsung/include/plat/udc.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/udc.h
rename to include/linux/platform_data/usb-s3c2410_udc.h
sound/soc/samsung/ac97.c +1 -1
index 3d04c1f..14fbcd3 100644
@@ -21,7 +21,7 @@
 
 #include <mach/dma.h>
 #include <plat/regs-ac97.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include "dma.h"
sound/soc/samsung/i2s.c +1 -1
index 6ac7b82..40b00a1 100644
@@ -20,7 +20,7 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include "dma.h"
 #include "idma.h"
sound/soc/samsung/pcm.c +1 -1
index 89b0646..c860819 100644
@@ -19,7 +19,7 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 #include <mach/dma.h>
 
 #include "dma.h"
sound/soc/samsung/s3c24xx_simtec.c +1 -1
index 656d5af..335a7d8 100644
@@ -13,7 +13,7 @@
 
 #include <sound/soc.h>
 
-#include <plat/audio-simtec.h>
+#include <linux/platform_data/asoc-s3c24xx_simtec.h>
 
 #include "s3c24xx-i2s.h"
 #include "s3c24xx_simtec.h"
sound/soc/samsung/spdif.c +1 -1
index a5a56a1..bc24c7a 100644
@@ -17,7 +17,7 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 #include <mach/dma.h>
 
 #include "dma.h"
Signature · 1 line
1.7.10
Acked-by on v1 15/16
#70 lore raw

Re: [PATCH 15/16] ARM: samsung: move platform_data definitions

Quoted 20 lines · Arnd Bergmann

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 <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Mark Brown <[email protected]>
Cc Jeff Garzik <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc "Wolfram Sang (embedded platforms)" <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Bryan Wu <[email protected]>
Cc Richard Purdie <[email protected]>
Cc Sylwester Nawrocki <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Chris Ball <[email protected]>
Quoted 8 lines
Cc David Woodhouse <[email protected]>
Cc Grant Likely <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Alan Stern <[email protected]>
Cc Sangbeom Kim <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc linux-samsung-soc at vger.kernel.org

for drivers/usb/gadget/:

Acked-by Felipe Balbi <[email protected]>
Quoted 1,665 lines
---
 arch/arm/mach-exynos/dev-audio.c                   |    2 +-
 arch/arm/mach-exynos/dev-ohci.c                    |    2 +-
 arch/arm/mach-exynos/mach-nuri.c                   |    6 +++---
 arch/arm/mach-exynos/mach-origen.c                 |    6 +++---
 arch/arm/mach-exynos/mach-smdk4x12.c               |    2 +-
 arch/arm/mach-exynos/mach-smdkv310.c               |    6 +++---
 arch/arm/mach-exynos/mach-universal_c210.c         |    4 ++--
 arch/arm/mach-exynos/setup-i2c0.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c1.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c2.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c3.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c4.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c5.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c6.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c7.c                  |    2 +-
 arch/arm/mach-s3c24xx/common-smdk.c                |    4 ++--
 arch/arm/mach-s3c24xx/mach-amlm5900.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-anubis.c                |    6 +++---
 arch/arm/mach-s3c24xx/mach-at2440evb.c             |    6 +++---
 arch/arm/mach-s3c24xx/mach-bast.c                  |    8 ++++----
 arch/arm/mach-s3c24xx/mach-gta02.c                 |   10 +++++-----
 arch/arm/mach-s3c24xx/mach-h1940.c                 |    8 ++++----
 arch/arm/mach-s3c24xx/mach-jive.c                  |    6 +++---
 arch/arm/mach-s3c24xx/mach-mini2440.c              |   10 +++++-----
 arch/arm/mach-s3c24xx/mach-n30.c                   |    8 ++++----
 arch/arm/mach-s3c24xx/mach-nexcoder.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-osiris.c                |    4 ++--
 arch/arm/mach-s3c24xx/mach-otom.c                  |    2 +-
 arch/arm/mach-s3c24xx/mach-qt2410.c                |    8 ++++----
 arch/arm/mach-s3c24xx/mach-rx1950.c                |   10 +++++-----
 arch/arm/mach-s3c24xx/mach-rx3715.c                |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2410.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2413.c              |    4 ++--
 arch/arm/mach-s3c24xx/mach-smdk2416.c              |    8 ++++----
 arch/arm/mach-s3c24xx/mach-smdk2440.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2443.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-tct_hammer.c            |    2 +-
 arch/arm/mach-s3c24xx/mach-vr1000.c                |    6 +++---
 arch/arm/mach-s3c24xx/mach-vstms.c                 |    4 ++--
 arch/arm/mach-s3c24xx/setup-i2c.c                  |    2 +-
 arch/arm/mach-s3c24xx/simtec-audio.c               |    2 +-
 arch/arm/mach-s3c24xx/simtec-usb.c                 |    2 +-
 arch/arm/mach-s3c64xx/dev-audio.c                  |    2 +-
 arch/arm/mach-s3c64xx/mach-anw6410.c               |    2 +-
 arch/arm/mach-s3c64xx/mach-crag6410-module.c       |    2 +-
 arch/arm/mach-s3c64xx/mach-crag6410.c              |    4 ++--
 arch/arm/mach-s3c64xx/mach-hmt.c                   |    4 ++--
 arch/arm/mach-s3c64xx/mach-mini6410.c              |    4 ++--
 arch/arm/mach-s3c64xx/mach-ncp.c                   |    2 +-
 arch/arm/mach-s3c64xx/mach-real6410.c              |    4 ++--
 arch/arm/mach-s3c64xx/mach-smartq.c                |    8 ++++----
 arch/arm/mach-s3c64xx/mach-smdk6400.c              |    2 +-
 arch/arm/mach-s3c64xx/mach-smdk6410.c              |    6 +++---
 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-s5p64x0/dev-audio.c                  |    2 +-
 arch/arm/mach-s5p64x0/mach-smdk6440.c              |    4 ++--
 arch/arm/mach-s5p64x0/mach-smdk6450.c              |    4 ++--
 arch/arm/mach-s5p64x0/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5p64x0/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pc100/dev-audio.c                  |    2 +-
 arch/arm/mach-s5pc100/mach-smdkc100.c              |    8 ++++----
 arch/arm/mach-s5pc100/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5pc100/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pv210/dev-audio.c                  |    2 +-
 arch/arm/mach-s5pv210/mach-goni.c                  |    2 +-
 arch/arm/mach-s5pv210/mach-smdkc110.c              |    4 ++--
 arch/arm/mach-s5pv210/mach-smdkv210.c              |    6 +++---
 arch/arm/mach-s5pv210/mach-torbreck.c              |    2 +-
 arch/arm/mach-s5pv210/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5pv210/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pv210/setup-i2c2.c                 |    2 +-
 arch/arm/plat-samsung/devs.c                       |   20 ++++++++++----------
 drivers/ata/pata_samsung_cf.c                      |    2 +-
 drivers/hwmon/s3c-hwmon.c                          |    2 +-
 drivers/i2c/busses/i2c-s3c2410.c                   |    2 +-
 drivers/input/touchscreen/s3c2410_ts.c             |    2 +-
 drivers/leds/leds-s3c24xx.c                        |    2 +-
 drivers/media/video/s5p-fimc/mipi-csis.c           |    2 +-
 drivers/mmc/host/s3cmci.c                          |    2 +-
 drivers/mtd/nand/s3c2410.c                         |    2 +-
 drivers/spi/spi-s3c64xx.c                          |    2 +-
 drivers/usb/gadget/s3c2410_udc.c                   |    2 +-
 drivers/usb/host/ehci-s5p.c                        |    2 +-
 drivers/usb/host/ohci-exynos.c                     |    2 +-
 drivers/usb/host/ohci-s3c2410.c                    |    2 +-
 .../linux/platform_data/asoc-s3c.h                 |    0
 .../linux/platform_data/asoc-s3c24xx_simtec.h      |    0
 .../linux/platform_data/ata-samsung_cf.h           |    0
 .../linux/platform_data/hwmon-s3c.h                |    0
 .../linux/platform_data/i2c-s3c2410.h              |    0
 .../linux/platform_data/leds-s3c24xx.h             |    0
 .../linux/platform_data/mipi-csis.h                |    0
 .../linux/platform_data/mmc-s3cmci.h               |    0
 .../linux/platform_data/mtd-nand-s3c2410.h         |    0
 .../linux/platform_data/spi-s3c64xx.h              |    0
 .../linux/platform_data/touchscreen-s3c2410.h      |    0
 .../linux/platform_data/usb-ehci-s5p.h             |    0
 .../linux/platform_data/usb-exynos.h               |    0
 .../linux/platform_data/usb-ohci-s3c2410.h         |    0
 .../linux/platform_data/usb-s3c2410_udc.h          |    0
 sound/soc/samsung/ac97.c                           |    2 +-
 sound/soc/samsung/i2s.c                            |    2 +-
 sound/soc/samsung/pcm.c                            |    2 +-
 sound/soc/samsung/s3c24xx_simtec.c                 |    2 +-
 sound/soc/samsung/spdif.c                          |    2 +-
 107 files changed, 164 insertions(+), 164 deletions(-)
 rename arch/arm/plat-samsung/include/plat/audio.h => include/linux/platform_data/asoc-s3c.h (100%)
 rename arch/arm/plat-samsung/include/plat/audio-simtec.h => include/linux/platform_data/asoc-s3c24xx_simtec.h (100%)
 rename arch/arm/plat-samsung/include/plat/ata.h => include/linux/platform_data/ata-samsung_cf.h (100%)
 rename arch/arm/plat-samsung/include/plat/hwmon.h => include/linux/platform_data/hwmon-s3c.h (100%)
 rename arch/arm/plat-samsung/include/plat/iic.h => include/linux/platform_data/i2c-s3c2410.h (100%)
 rename arch/arm/mach-s3c24xx/include/mach/leds-gpio.h => include/linux/platform_data/leds-s3c24xx.h (100%)
 rename arch/arm/plat-samsung/include/plat/mipi_csis.h => include/linux/platform_data/mipi-csis.h (100%)
 rename arch/arm/plat-samsung/include/plat/mci.h => include/linux/platform_data/mmc-s3cmci.h (100%)
 rename arch/arm/plat-samsung/include/plat/nand.h => include/linux/platform_data/mtd-nand-s3c2410.h (100%)
 rename arch/arm/plat-samsung/include/plat/s3c64xx-spi.h => include/linux/platform_data/spi-s3c64xx.h (100%)
 rename arch/arm/plat-samsung/include/plat/ts.h => include/linux/platform_data/touchscreen-s3c2410.h (100%)
 rename arch/arm/plat-samsung/include/plat/ehci.h => include/linux/platform_data/usb-ehci-s5p.h (100%)
 rename arch/arm/mach-exynos/include/mach/ohci.h => include/linux/platform_data/usb-exynos.h (100%)
 rename arch/arm/plat-samsung/include/plat/usb-control.h => include/linux/platform_data/usb-ohci-s3c2410.h (100%)
 rename arch/arm/plat-samsung/include/plat/udc.h => include/linux/platform_data/usb-s3c2410_udc.h (100%)
arch/arm/mach-exynos/dev-audio.c +1 -1
index b33a5b6..ae321c7 100644
@@ -16,7 +16,7 @@
 #include <linux/gpio.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include <mach/map.h>
 #include <mach/dma.h>
arch/arm/mach-exynos/dev-ohci.c +1 -1
index b8e7530..14ed795 100644
@@ -15,7 +15,7 @@
 
 #include <mach/irqs.h>
 #include <mach/map.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/usb-exynos.h>
 
 #include <plat/devs.h>
 #include <plat/usb-phy.h>
arch/arm/mach-exynos/mach-nuri.c +3 -3
index ea785fc..393d2ce 100644
@@ -45,14 +45,14 @@
 #include <plat/devs.h>
 #include <plat/fb.h>
 #include <plat/sdhci.h>
-#include <plat/ehci.h>
+#include <linux/platform_data/usb-ehci-s5p.h>
 #include <plat/clock.h>
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/mfc.h>
 #include <plat/fimc-core.h>
 #include <plat/camport.h>
-#include <plat/mipi_csis.h>
+#include <linux/platform_data/mipi-csis.h>
 
 #include <mach/map.h>
arch/arm/mach-exynos/mach-origen.c +3 -3
index 5ca8030..4a531dc 100644
@@ -35,15 +35,15 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/sdhci.h>
-#include <plat/iic.h>
-#include <plat/ehci.h>
+#include <linux/platform_data/i2c-s3c2410.h>
+#include <linux/platform_data/usb-ehci-s5p.h>
 #include <plat/clock.h>
 #include <plat/gpio-cfg.h>
 #include <plat/backlight.h>
 #include <plat/fb.h>
 #include <plat/mfc.h>
 
-#include <mach/ohci.h>
+#include <linux/platform_data/usb-exynos.h>
 #include <mach/map.h>
 
 #include <drm/exynos_drm.h>
arch/arm/mach-exynos/mach-smdk4x12.c +1 -1
index b26beb1..6a791fd 100644
@@ -32,7 +32,7 @@
 #include <plat/devs.h>
 #include <plat/fb.h>
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/keypad.h>
 #include <plat/mfc.h>
 #include <plat/regs-fb.h>
arch/arm/mach-exynos/mach-smdkv310.c +3 -3
index 3cfa688..fa2ada6 100644
@@ -34,15 +34,15 @@
 #include <plat/fb.h>
 #include <plat/keypad.h>
 #include <plat/sdhci.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 #include <plat/backlight.h>
 #include <plat/mfc.h>
-#include <plat/ehci.h>
+#include <linux/platform_data/usb-ehci-s5p.h>
 #include <plat/clock.h>
 
 #include <mach/map.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/usb-exynos.h>
 
 #include <drm/exynos_drm.h>
 #include "common.h"
arch/arm/mach-exynos/mach-universal_c210.c +2 -2
index 4d1f40d..bc49e5a 100644
@@ -34,7 +34,7 @@
 #include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 #include <plat/fb.h>
 #include <plat/mfc.h>

@@ -43,7 +43,7 @@
 #include <plat/fimc-core.h>
 #include <plat/s5p-time.h>
 #include <plat/camport.h>
-#include <plat/mipi_csis.h>
+#include <linux/platform_data/mipi-csis.h>
 
 #include <mach/map.h>
arch/arm/mach-exynos/setup-i2c0.c +1 -1
index b90d94c..5700f23 100644
@@ -14,7 +14,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 #include <plat/cpu.h>
arch/arm/mach-exynos/setup-i2c1.c +1 -1
index fd7235a..8d2279c 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c1_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c2.c +1 -1
index 2694b19..0ed62fc 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c2_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c3.c +1 -1
index 379bd30..7787fd2 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c3_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c4.c +1 -1
index 9f3c048..edc847f 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c4_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c5.c +1 -1
index 77e1a1e..d88af7f 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c5_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c6.c +1 -1
index 284d12b..c590286 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c6_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c7.c +1 -1
index b7611ee..1bba755 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c7_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s3c24xx/common-smdk.c +2 -2
index 87e75a2..3b2cf6d 100644
@@ -37,9 +37,9 @@
 #include <asm/irq.h>
 
 #include <mach/regs-gpio.h>
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 
 #include <plat/common-smdk.h>
 #include <plat/gpio-cfg.h>
arch/arm/mach-s3c24xx/mach-amlm5900.c +1 -1
index ea2c4b00..f4ad99c 100644
@@ -53,7 +53,7 @@
 #include <mach/regs-lcd.h>
 #include <mach/regs-gpio.h>
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/gpio-cfg.h>
arch/arm/mach-s3c24xx/mach-anubis.c +3 -3
index 5a7d0c0..df890fb 100644
@@ -40,8 +40,8 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>

@@ -53,7 +53,7 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/audio-simtec.h>
+#include <linux/platform_data/asoc-s3c24xx_simtec.h>
 
 #include "simtec.h"
 #include "common.h"
arch/arm/mach-s3c24xx/mach-at2440evb.c +3 -3
index 7a05abf..00381fe 100644
@@ -36,8 +36,8 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>

@@ -47,7 +47,7 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/mci.h>
+#include <linux/platform_data/mmc-s3cmci.h>
 
 #include "common.h"
arch/arm/mach-s3c24xx/mach-bast.c +4 -4
index 1cf1720..6a30ce7 100644
@@ -45,9 +45,9 @@
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
 
-#include <plat/hwmon.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/hwmon-s3c.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <mach/fb.h>
 
 #include <linux/mtd/mtd.h>

@@ -62,7 +62,7 @@
 #include <plat/cpu.h>
 #include <plat/cpu-freq.h>
 #include <plat/gpio-cfg.h>
-#include <plat/audio-simtec.h>
+#include <linux/platform_data/asoc-s3c24xx_simtec.h>
 
 #include "simtec.h"
 #include "common.h"
arch/arm/mach-s3c24xx/mach-gta02.c +5 -5
index 92e1f93..4a96346 100644
@@ -73,21 +73,21 @@
 #include <mach/regs-gpio.h>
 #include <mach/fb.h>
 
-#include <plat/usb-control.h>
+#include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <mach/regs-mem.h>
 #include <mach/hardware.h>
 
 #include <mach/gta02.h>
 
 #include <plat/regs-serial.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>
-#include <plat/udc.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
-#include <plat/ts.h>
+#include <linux/platform_data/i2c-s3c2410.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 
 #include "common.h"
arch/arm/mach-s3c24xx/mach-h1940.c +4 -4
index bb8d008..9638b33 100644
@@ -56,8 +56,8 @@
 #include <mach/h1940.h>
 #include <mach/h1940-latch.h>
 #include <mach/fb.h>
-#include <plat/udc.h>
-#include <plat/iic.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/gpio-cfg.h>
 #include <plat/clock.h>

@@ -65,8 +65,8 @@
 #include <plat/cpu.h>
 #include <plat/pll.h>
 #include <plat/pm.h>
-#include <plat/mci.h>
-#include <plat/ts.h>
+#include <linux/platform_data/mmc-s3cmci.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 
 #include <sound/uda1380.h>
arch/arm/mach-s3c24xx/mach-jive.c +3 -3
index ae73ba3..28ad25b 100644
@@ -32,8 +32,8 @@
 #include <asm/mach/irq.h>
 
 #include <plat/regs-serial.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <mach/regs-power.h>
 #include <mach/regs-gpio.h>

@@ -54,7 +54,7 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>
-#include <plat/udc.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
 
 static struct map_desc jive_iodesc[] __initdata = {
 };
arch/arm/mach-s3c24xx/mach-mini2440.c +5 -5
index bd6d252..c676b8e 100644
@@ -39,14 +39,14 @@
 
 #include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
 #include <mach/irqs.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
-#include <plat/mci.h>
-#include <plat/udc.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/mtd/mtd.h>
 #include <linux/mtd/nand.h>
arch/arm/mach-s3c24xx/mach-n30.c +4 -4
index 383d00c..c53a9bf 100644
@@ -33,7 +33,7 @@
 #include <asm/mach-types.h>
 
 #include <mach/fb.h>
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
 

@@ -41,15 +41,15 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/regs-serial.h>
 
 #include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/mci.h>
+#include <linux/platform_data/mmc-s3cmci.h>
 #include <plat/s3c2410.h>
-#include <plat/udc.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
 
 #include "common.h"
arch/arm/mach-s3c24xx/mach-nexcoder.c +1 -1
index 5c05ba1..7841321 100644
@@ -38,7 +38,7 @@
 //#include <asm/debug-ll.h>
 #include <mach/regs-gpio.h>
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/gpio-cfg.h>
 #include <plat/s3c2410.h>
arch/arm/mach-s3c24xx/mach-osiris.c +2 -2
index 95d0772..63c20019 100644
@@ -41,8 +41,8 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
arch/arm/mach-s3c24xx/mach-otom.c +1 -1
index bc4b6ef..bca39f0 100644
@@ -35,7 +35,7 @@
 #include <plat/s3c2410.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/cpu.h>
 
 #include "common.h"
arch/arm/mach-s3c24xx/mach-qt2410.c +4 -4
index 678bbca..7b6ba13 100644
@@ -47,13 +47,13 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 #include <mach/regs-lcd.h>
 #include <plat/regs-serial.h>
 #include <mach/fb.h>
-#include <plat/nand.h>
-#include <plat/udc.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/common-smdk.h>
 #include <plat/gpio-cfg.h>
arch/arm/mach-s3c24xx/mach-rx1950.c +5 -5
index 7ee73f2..379fde5 100644
@@ -49,15 +49,15 @@
 #include <plat/clock.h>
 #include <plat/regs-serial.h>
 #include <plat/regs-iic.h>
-#include <plat/mci.h>
-#include <plat/udc.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mmc-s3cmci.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>
 #include <plat/irq.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 
 #include <sound/uda1380.h>
arch/arm/mach-s3c24xx/mach-rx3715.c +1 -1
index 56af354..dacbb9a 100644
@@ -43,7 +43,7 @@
 #include <mach/regs-lcd.h>
 
 #include <mach/h1940.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <mach/fb.h>
 
 #include <plat/clock.h>
arch/arm/mach-s3c24xx/mach-smdk2410.c +1 -1
index bdc27e7..82796b9 100644
@@ -47,7 +47,7 @@
 #include <asm/mach-types.h>
 
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/devs.h>
 #include <plat/cpu.h>
arch/arm/mach-s3c24xx/mach-smdk2413.c +2 -2
index b11451b..ce99fd8 100644
@@ -38,8 +38,8 @@
 #include <mach/regs-lcd.h>
 
 #include <mach/idle.h>
-#include <plat/udc.h>
-#include <plat/iic.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <mach/fb.h>
 
 #include <plat/s3c2410.h>
arch/arm/mach-s3c24xx/mach-smdk2416.c +4 -4
index c3100a0..db2787a 100644
@@ -39,17 +39,17 @@
 #include <mach/regs-s3c2443-clock.h>
 
 #include <mach/idle.h>
-#include <mach/leds-gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/leds-s3c24xx.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/s3c2416.h>
 #include <plat/gpio-cfg.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/sdhci.h>
-#include <plat/udc.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
 #include <linux/platform_data/s3c-hsudc.h>
 
 #include <plat/regs-fb-v4.h>
arch/arm/mach-s3c24xx/mach-smdk2440.c +1 -1
index 83a1036..b7ff882 100644
@@ -37,7 +37,7 @@
 
 #include <mach/idle.h>
 #include <mach/fb.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/s3c2410.h>
 #include <plat/s3c244x.h>
arch/arm/mach-s3c24xx/mach-smdk2443.c +1 -1
index 2092369..2568656 100644
@@ -37,7 +37,7 @@
 
 #include <mach/idle.h>
 #include <mach/fb.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/s3c2410.h>
 #include <plat/s3c2443.h>
arch/arm/mach-s3c24xx/mach-tct_hammer.c +1 -1
index fe99028..495bf5c 100644
@@ -45,7 +45,7 @@
 #include <asm/mach-types.h>
 
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
arch/arm/mach-s3c24xx/mach-vr1000.c +3 -3
index bd5f189..14d5b12 100644
@@ -43,13 +43,13 @@
 
 #include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/iic.h>
-#include <plat/audio-simtec.h>
+#include <linux/platform_data/i2c-s3c2410.h>
+#include <linux/platform_data/asoc-s3c24xx_simtec.h>
 
 #include "simtec.h"
 #include "common.h"
arch/arm/mach-s3c24xx/mach-vstms.c +2 -2
index 94bfaa1..f1d44ae 100644
@@ -39,8 +39,8 @@
 #include <mach/idle.h>
 #include <mach/fb.h>
 
-#include <plat/iic.h>
-#include <plat/nand.h>
+#include <linux/platform_data/i2c-s3c2410.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 
 #include <plat/s3c2410.h>
 #include <plat/s3c2412.h>
arch/arm/mach-s3c24xx/setup-i2c.c +1 -1
index 9e90a7c..7b4f333 100644
@@ -16,7 +16,7 @@
 struct platform_device;
 
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
arch/arm/mach-s3c24xx/simtec-audio.c +1 -1
index 11881c9..fd0ef05 100644
@@ -24,7 +24,7 @@
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
 
-#include <plat/audio-simtec.h>
+#include <linux/platform_data/asoc-s3c24xx_simtec.h>
 #include <plat/devs.h>
 
 #include "simtec.h"
arch/arm/mach-s3c24xx/simtec-usb.c +1 -1
index d91c1a7..17f8356 100644
@@ -34,7 +34,7 @@
 #include <mach/hardware.h>
 #include <asm/irq.h>
 
-#include <plat/usb-control.h>
+#include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <plat/devs.h>
 
 #include "simtec.h"
arch/arm/mach-s3c64xx/dev-audio.c +1 -1
index 124fd5d..35f3e07 100644
@@ -20,7 +20,7 @@
 #include <mach/dma.h>
 
 #include <plat/devs.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 #include <plat/gpio-cfg.h>
 
 static const char *rclksrc[] = {
arch/arm/mach-s3c64xx/mach-anw6410.c +1 -1
index ffa29dd..15c58df 100644
@@ -42,7 +42,7 @@
 #include <asm/mach-types.h>
 
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
 #include <plat/regs-fb-v4.h>
arch/arm/mach-s3c64xx/mach-crag6410-module.c +1 -1
index 9e382e7..181aa994 100644
@@ -24,7 +24,7 @@
 #include <sound/wm8962.h>
 #include <sound/wm9081.h>
 
-#include <plat/s3c64xx-spi.h>
+#include <linux/platform_data/spi-s3c64xx.h>
 
 #include <mach/crag6410.h>
arch/arm/mach-s3c64xx/mach-crag6410.c +2 -2
index 09cd812..717d675 100644
@@ -61,14 +61,14 @@
 #include <plat/fb.h>
 #include <plat/sdhci.h>
 #include <plat/gpio-cfg.h>
-#include <plat/s3c64xx-spi.h>
+#include <linux/platform_data/spi-s3c64xx.h>
 
 #include <plat/keypad.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/adc.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/pm.h>
 
 #include "common.h"
arch/arm/mach-s3c64xx/mach-hmt.c +2 -2
index 6890881..02222b3 100644
@@ -34,9 +34,9 @@
 #include <asm/mach-types.h>
 
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 
 #include <plat/clock.h>
 #include <plat/devs.h>
arch/arm/mach-s3c64xx/mach-mini6410.c +2 -2
index 5539a255..09311cc 100644
@@ -38,9 +38,9 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/fb.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/regs-serial.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/regs-fb-v4.h>
 
 #include <video/platform_lcd.h>
arch/arm/mach-s3c64xx/mach-ncp.c +1 -1
index cad2e05..46ee88d 100644
@@ -37,7 +37,7 @@
 #include <asm/mach-types.h>
 
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
 
 #include <plat/clock.h>
arch/arm/mach-s3c64xx/mach-real6410.c +2 -2
index 326b216..6daca20 100644
@@ -39,9 +39,9 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/fb.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/regs-serial.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/regs-fb-v4.h>
 
 #include <video/platform_lcd.h>
arch/arm/mach-s3c64xx/mach-smartq.c +4 -4
index ceeb1de..c6d7390 100644
@@ -30,13 +30,13 @@
 #include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
-#include <plat/hwmon.h>
+#include <linux/platform_data/hwmon-s3c.h>
 #include <plat/regs-serial.h>
-#include <plat/usb-control.h>
+#include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <plat/sdhci.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 
 #include <video/platform_lcd.h>
arch/arm/mach-s3c64xx/mach-smdk6400.c +1 -1
index b0f4525..a928fae 100644
@@ -35,7 +35,7 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include "common.h"
arch/arm/mach-s3c64xx/mach-smdk6410.c +3 -3
index 0fe4f15..2547a88 100644
@@ -60,8 +60,8 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-sys.h>
 #include <mach/regs-srom.h>
-#include <plat/ata.h>
-#include <plat/iic.h>
+#include <linux/platform_data/ata-samsung_cf.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
 #include <plat/gpio-cfg.h>
 

@@ -69,7 +69,7 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/adc.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/keypad.h>
 #include <plat/backlight.h>
 #include <plat/regs-fb-v4.h>
arch/arm/mach-s3c64xx/setup-i2c0.c +1 -1
index 241af94..40666ba 100644
@@ -18,7 +18,7 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c0_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s3c64xx/setup-i2c1.c +1 -1
index 3d13a96..3fdb24c 100644
@@ -18,7 +18,7 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c1_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s3c64xx/setup-ide.c +1 -1
index 41b4256..648d8b8 100644
@@ -17,7 +17,7 @@
 #include <mach/map.h>
 #include <mach/regs-clock.h>
 #include <plat/gpio-cfg.h>
-#include <plat/ata.h>
+#include <linux/platform_data/ata-samsung_cf.h>
 
 void s3c64xx_ide_setup_gpio(void)
 {
arch/arm/mach-s5p64x0/dev-audio.c +1 -1
index 91113dd..a0d6edf 100644
@@ -13,7 +13,7 @@
 #include <linux/gpio.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include <mach/map.h>
 #include <mach/dma.h>
arch/arm/mach-s5p64x0/mach-smdk6440.c +2 -2
index 92fefad..dea78a8 100644
@@ -45,10 +45,10 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/pll.h>
 #include <plat/adc.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/s5p-time.h>
 #include <plat/backlight.h>
 #include <plat/fb.h>
arch/arm/mach-s5p64x0/mach-smdk6450.c +2 -2
index e2335ec..6f14fc7 100644
@@ -45,10 +45,10 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/pll.h>
 #include <plat/adc.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/s5p-time.h>
 #include <plat/backlight.h>
 #include <plat/fb.h>
arch/arm/mach-s5p64x0/setup-i2c0.c +1 -1
index 46b4639..a32edc5 100644
@@ -19,7 +19,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <mach/i2c.h>
arch/arm/mach-s5p64x0/setup-i2c1.c +1 -1
index 6ad3b98..ca2c5c7 100644
@@ -19,7 +19,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <mach/i2c.h>
arch/arm/mach-s5pc100/dev-audio.c +1 -1
index 9d4bde3..1cc252c 100644
@@ -13,7 +13,7 @@
 #include <linux/gpio.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include <mach/map.h>
 #include <mach/dma.h>
arch/arm/mach-s5pc100/mach-smdkc100.c +4 -4
index 0c3ae38..5d2c093 100644
@@ -44,12 +44,12 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/fb.h>
-#include <plat/iic.h>
-#include <plat/ata.h>
+#include <linux/platform_data/i2c-s3c2410.h>
+#include <linux/platform_data/ata-samsung_cf.h>
 #include <plat/adc.h>
 #include <plat/keypad.h>
-#include <plat/ts.h>
-#include <plat/audio.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
+#include <linux/platform_data/asoc-s3c.h>
 #include <plat/backlight.h>
 #include <plat/regs-fb-v4.h>
arch/arm/mach-s5pc100/setup-i2c0.c +1 -1
index eaef7a3..89a6a76 100644
@@ -18,7 +18,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c0_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s5pc100/setup-i2c1.c +1 -1
index aaff74a..faa667e 100644
@@ -18,7 +18,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c1_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s5pv210/dev-audio.c +1 -1
index 8367749..0a5480b 100644
@@ -13,7 +13,7 @@
 #include <linux/gpio.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include <mach/map.h>
 #include <mach/dma.h>
arch/arm/mach-s5pv210/mach-goni.c +1 -1
index 822a559..00f1e47 100644
@@ -43,7 +43,7 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/fb.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/keypad.h>
 #include <plat/sdhci.h>
 #include <plat/clock.h>
arch/arm/mach-s5pv210/mach-smdkc110.c +2 -2
index dfc2923..d9c99fc 100644
@@ -27,8 +27,8 @@
 #include <plat/regs-serial.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/ata.h>
-#include <plat/iic.h>
+#include <linux/platform_data/ata-samsung_cf.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/pm.h>
 #include <plat/s5p-time.h>
 #include <plat/mfc.h>
arch/arm/mach-s5pv210/mach-smdkv210.c +3 -3
index 918b23d..7d6fab4 100644
@@ -38,9 +38,9 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/adc.h>
-#include <plat/ts.h>
-#include <plat/ata.h>
-#include <plat/iic.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
+#include <linux/platform_data/ata-samsung_cf.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/keypad.h>
 #include <plat/pm.h>
 #include <plat/fb.h>
arch/arm/mach-s5pv210/mach-torbreck.c +1 -1
index 74e99bc..18785cb 100644
@@ -26,7 +26,7 @@
 #include <plat/regs-serial.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/s5p-time.h>
 
 #include "common.h"
arch/arm/mach-s5pv210/setup-i2c0.c +1 -1
index 0f1cc3a..4a15849 100644
@@ -18,7 +18,7 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c0_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s5pv210/setup-i2c1.c +1 -1
index f61365a..4777f6b 100644
@@ -18,7 +18,7 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c1_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s5pv210/setup-i2c2.c +1 -1
index 2f91b5c..bbce6c7 100644
@@ -18,7 +18,7 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c2_cfg_gpio(struct platform_device *dev)
arch/arm/plat-samsung/devs.c +10 -10
index 74e31ce..07913ac 100644
@@ -46,24 +46,24 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/adc.h>
-#include <plat/ata.h>
-#include <plat/ehci.h>
+#include <linux/platform_data/ata-samsung_cf.h>
+#include <linux/platform_data/usb-ehci-s5p.h>
 #include <plat/fb.h>
 #include <plat/fb-s3c2410.h>
-#include <plat/hwmon.h>
-#include <plat/iic.h>
+#include <linux/platform_data/hwmon-s3c.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/keypad.h>
-#include <plat/mci.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mmc-s3cmci.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/sdhci.h>
-#include <plat/ts.h>
-#include <plat/udc.h>
-#include <plat/usb-control.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
+#include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <plat/usb-phy.h>
 #include <plat/regs-iic.h>
 #include <plat/regs-serial.h>
 #include <plat/regs-spi.h>
-#include <plat/s3c64xx-spi.h>
+#include <linux/platform_data/spi-s3c64xx.h>
 
 static u64 samsung_device_dma_mask = DMA_BIT_MASK(32);
drivers/ata/pata_samsung_cf.c +1 -1
index 1b372c2..63ffb00 100644
@@ -23,7 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
-#include <plat/ata.h>
+#include <linux/platform_data/ata-samsung_cf.h>
 #include <plat/regs-ata.h>
 
 #define DRV_NAME "pata_samsung_cf"
drivers/hwmon/s3c-hwmon.c +1 -1
index b7975f8..fe11b95 100644
@@ -34,7 +34,7 @@
 #include <linux/hwmon-sysfs.h>
 
 #include <plat/adc.h>
-#include <plat/hwmon.h>
+#include <linux/platform_data/hwmon-s3c.h>
 
 struct s3c_hwmon_attr {
 	struct sensor_device_attribute	in;
drivers/i2c/busses/i2c-s3c2410.c +1 -1
index 5ae3b02..4d07dea 100644
@@ -42,7 +42,7 @@
 #include <asm/irq.h>
 
 #include <plat/regs-iic.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 /* Treat S3C2410 as baseline hardware, anything else is supported via quirks */
 #define QUIRK_S3C2440		(1 << 0)
drivers/input/touchscreen/s3c2410_ts.c +1 -1
index bf1a064..df9e816 100644
@@ -37,7 +37,7 @@
 
 #include <plat/adc.h>
 #include <plat/regs-adc.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 
 #define TSC_SLEEP  (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))
drivers/leds/leds-s3c24xx.c +1 -1
index 942f0ea..e1a0df6 100644
@@ -21,7 +21,7 @@
 
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 
 /* our context */
drivers/media/video/s5p-fimc/mipi-csis.c +1 -1
index 2f73d9e..5e89843 100644
@@ -26,7 +26,7 @@
 #include <linux/spinlock.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-subdev.h>
-#include <plat/mipi_csis.h>
+#include <linux/platform_data/mipi-csis.h>
 #include "mipi-csis.h"
 
 static int debug;
drivers/mmc/host/s3cmci.c +1 -1
index bd5a5cc..4638dda 100644
@@ -27,7 +27,7 @@
 
 #include <mach/regs-sdi.h>
 
-#include <plat/mci.h>
+#include <linux/platform_data/mmc-s3cmci.h>
 
 #include "s3cmci.h"
drivers/mtd/nand/s3c2410.c +1 -1
index 91121f3..d804061 100644
@@ -46,7 +46,7 @@
 #include <asm/io.h>
 
 #include <plat/regs-nand.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 
 #ifdef CONFIG_MTD_NAND_S3C2410_HWECC
 static int hardware_ecc = 1;
drivers/spi/spi-s3c64xx.c +1 -1
index d1c8441f..0e2a022 100644
@@ -32,7 +32,7 @@
 #include <linux/of_gpio.h>
 
 #include <mach/dma.h>
-#include <plat/s3c64xx-spi.h>
+#include <linux/platform_data/spi-s3c64xx.h>
 
 #define MAX_SPI_PORTS		3
drivers/usb/gadget/s3c2410_udc.c +1 -1
index f2e51f5..f006045 100644
@@ -43,7 +43,7 @@
 #include <mach/hardware.h>
 
 #include <plat/regs-udc.h>
-#include <plat/udc.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
 
 
 #include "s3c2410_udc.h"
drivers/usb/host/ehci-s5p.c +1 -1
index 9d8f1dd..dfb14c7 100644
@@ -16,7 +16,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/of_gpio.h>
-#include <plat/ehci.h>
+#include <linux/platform_data/usb-ehci-s5p.h>
 #include <plat/usb-phy.h>
 
 #define EHCI_INSNREG00(base)			(base + 0x90)
drivers/usb/host/ohci-exynos.c +1 -1
index fc3091b..20a5008 100644
@@ -14,7 +14,7 @@
 #include <linux/clk.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/usb-exynos.h>
 #include <plat/usb-phy.h>
 
 struct exynos_ohci_hcd {
drivers/usb/host/ohci-s3c2410.c +1 -1
index 664c869..0d2309c 100644
@@ -21,7 +21,7 @@
 
 #include <linux/platform_device.h>
 #include <linux/clk.h>
-#include <plat/usb-control.h>
+#include <linux/platform_data/usb-ohci-s3c2410.h>
 
 #define valid_port(idx) ((idx) == 1 || (idx) == 2)
include/linux/platform_data/asoc-s3c.h renamed from arch/arm/plat-samsung/include/plat/audio.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/audio.h
rename to include/linux/platform_data/asoc-s3c.h
include/linux/platform_data/asoc-s3c24xx_simtec.h renamed from arch/arm/plat-samsung/include/plat/audio-simtec.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/audio-simtec.h
rename to include/linux/platform_data/asoc-s3c24xx_simtec.h
include/linux/platform_data/ata-samsung_cf.h renamed from arch/arm/plat-samsung/include/plat/ata.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/ata.h
rename to include/linux/platform_data/ata-samsung_cf.h
include/linux/platform_data/hwmon-s3c.h renamed from arch/arm/plat-samsung/include/plat/hwmon.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/hwmon.h
rename to include/linux/platform_data/hwmon-s3c.h
include/linux/platform_data/i2c-s3c2410.h renamed from arch/arm/plat-samsung/include/plat/iic.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/iic.h
rename to include/linux/platform_data/i2c-s3c2410.h
include/linux/platform_data/leds-s3c24xx.h renamed from arch/arm/mach-s3c24xx/include/mach/leds-gpio.h +0 -0
similarity index 100%
rename from arch/arm/mach-s3c24xx/include/mach/leds-gpio.h
rename to include/linux/platform_data/leds-s3c24xx.h
include/linux/platform_data/mipi-csis.h renamed from arch/arm/plat-samsung/include/plat/mipi_csis.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/mipi_csis.h
rename to include/linux/platform_data/mipi-csis.h
include/linux/platform_data/mmc-s3cmci.h renamed from arch/arm/plat-samsung/include/plat/mci.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/mci.h
rename to include/linux/platform_data/mmc-s3cmci.h
include/linux/platform_data/mtd-nand-s3c2410.h renamed from arch/arm/plat-samsung/include/plat/nand.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/nand.h
rename to include/linux/platform_data/mtd-nand-s3c2410.h
include/linux/platform_data/spi-s3c64xx.h renamed from arch/arm/plat-samsung/include/plat/s3c64xx-spi.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/s3c64xx-spi.h
rename to include/linux/platform_data/spi-s3c64xx.h
include/linux/platform_data/touchscreen-s3c2410.h renamed from arch/arm/plat-samsung/include/plat/ts.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/ts.h
rename to include/linux/platform_data/touchscreen-s3c2410.h
include/linux/platform_data/usb-ehci-s5p.h renamed from arch/arm/plat-samsung/include/plat/ehci.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/ehci.h
rename to include/linux/platform_data/usb-ehci-s5p.h
include/linux/platform_data/usb-exynos.h renamed from arch/arm/mach-exynos/include/mach/ohci.h +0 -0
similarity index 100%
rename from arch/arm/mach-exynos/include/mach/ohci.h
rename to include/linux/platform_data/usb-exynos.h
include/linux/platform_data/usb-ohci-s3c2410.h renamed from arch/arm/plat-samsung/include/plat/usb-control.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/usb-control.h
rename to include/linux/platform_data/usb-ohci-s3c2410.h
include/linux/platform_data/usb-s3c2410_udc.h renamed from arch/arm/plat-samsung/include/plat/udc.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/udc.h
rename to include/linux/platform_data/usb-s3c2410_udc.h
sound/soc/samsung/ac97.c +1 -1
index 3d04c1f..14fbcd3 100644
@@ -21,7 +21,7 @@
 
 #include <mach/dma.h>
 #include <plat/regs-ac97.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include "dma.h"
sound/soc/samsung/i2s.c +1 -1
index 6ac7b82..40b00a1 100644
@@ -20,7 +20,7 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include "dma.h"
 #include "idma.h"
sound/soc/samsung/pcm.c +1 -1
index 89b0646..c860819 100644
@@ -19,7 +19,7 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 #include <mach/dma.h>
 
 #include "dma.h"
sound/soc/samsung/s3c24xx_simtec.c +1 -1
index 656d5af..335a7d8 100644
@@ -13,7 +13,7 @@
 
 #include <sound/soc.h>
 
-#include <plat/audio-simtec.h>
+#include <linux/platform_data/asoc-s3c24xx_simtec.h>
 
 #include "s3c24xx-i2s.h"
 #include "s3c24xx_simtec.h"
sound/soc/samsung/spdif.c +1 -1
index a5a56a1..bc24c7a 100644
@@ -17,7 +17,7 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 #include <mach/dma.h>
 
 #include "dma.h"
Signature · 1 line
1.7.10
Signature · 8 lines
balbi
-------------- 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/20120911/97138e89/attachment-0001.sig>
Acked-by on v1 15/16
#71 lore raw

Re: [PATCH 15/16] ARM: samsung: move platform_data definitions

In reply to Arnd Bergmann
Quoted 96 lines · Arnd Bergmann

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 <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Mark Brown <[email protected]>
Cc Jeff Garzik <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc "Wolfram Sang (embedded platforms)" <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Bryan Wu <[email protected]>
Cc Richard Purdie <[email protected]>
Cc Sylwester Nawrocki <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Chris Ball <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Grant Likely <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Alan Stern <[email protected]>
Cc Sangbeom Kim <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc linux-samsung-soc at vger.kernel.org
---
  arch/arm/mach-exynos/dev-audio.c                   |    2 +-
  arch/arm/mach-exynos/dev-ohci.c                    |    2 +-
  arch/arm/mach-exynos/mach-nuri.c                   |    6 +++---
  arch/arm/mach-exynos/mach-origen.c                 |    6 +++---
  arch/arm/mach-exynos/mach-smdk4x12.c               |    2 +-
  arch/arm/mach-exynos/mach-smdkv310.c               |    6 +++---
  arch/arm/mach-exynos/mach-universal_c210.c         |    4 ++--
  arch/arm/mach-exynos/setup-i2c0.c                  |    2 +-
  arch/arm/mach-exynos/setup-i2c1.c                  |    2 +-
  arch/arm/mach-exynos/setup-i2c2.c                  |    2 +-
  arch/arm/mach-exynos/setup-i2c3.c                  |    2 +-
  arch/arm/mach-exynos/setup-i2c4.c                  |    2 +-
  arch/arm/mach-exynos/setup-i2c5.c                  |    2 +-
  arch/arm/mach-exynos/setup-i2c6.c                  |    2 +-
  arch/arm/mach-exynos/setup-i2c7.c                  |    2 +-
  arch/arm/mach-s3c24xx/common-smdk.c                |    4 ++--
  arch/arm/mach-s3c24xx/mach-amlm5900.c              |    2 +-
  arch/arm/mach-s3c24xx/mach-anubis.c                |    6 +++---
  arch/arm/mach-s3c24xx/mach-at2440evb.c             |    6 +++---
  arch/arm/mach-s3c24xx/mach-bast.c                  |    8 ++++----
  arch/arm/mach-s3c24xx/mach-gta02.c                 |   10 +++++-----
  arch/arm/mach-s3c24xx/mach-h1940.c                 |    8 ++++----
  arch/arm/mach-s3c24xx/mach-jive.c                  |    6 +++---
  arch/arm/mach-s3c24xx/mach-mini2440.c              |   10 +++++-----
  arch/arm/mach-s3c24xx/mach-n30.c                   |    8 ++++----
  arch/arm/mach-s3c24xx/mach-nexcoder.c              |    2 +-
  arch/arm/mach-s3c24xx/mach-osiris.c                |    4 ++--
  arch/arm/mach-s3c24xx/mach-otom.c                  |    2 +-
  arch/arm/mach-s3c24xx/mach-qt2410.c                |    8 ++++----
  arch/arm/mach-s3c24xx/mach-rx1950.c                |   10 +++++-----
  arch/arm/mach-s3c24xx/mach-rx3715.c                |    2 +-
  arch/arm/mach-s3c24xx/mach-smdk2410.c              |    2 +-
  arch/arm/mach-s3c24xx/mach-smdk2413.c              |    4 ++--
  arch/arm/mach-s3c24xx/mach-smdk2416.c              |    8 ++++----
  arch/arm/mach-s3c24xx/mach-smdk2440.c              |    2 +-
  arch/arm/mach-s3c24xx/mach-smdk2443.c              |    2 +-
  arch/arm/mach-s3c24xx/mach-tct_hammer.c            |    2 +-
  arch/arm/mach-s3c24xx/mach-vr1000.c                |    6 +++---
  arch/arm/mach-s3c24xx/mach-vstms.c                 |    4 ++--
  arch/arm/mach-s3c24xx/setup-i2c.c                  |    2 +-
  arch/arm/mach-s3c24xx/simtec-audio.c               |    2 +-
  arch/arm/mach-s3c24xx/simtec-usb.c                 |    2 +-
  arch/arm/mach-s3c64xx/dev-audio.c                  |    2 +-
  arch/arm/mach-s3c64xx/mach-anw6410.c               |    2 +-
  arch/arm/mach-s3c64xx/mach-crag6410-module.c       |    2 +-
  arch/arm/mach-s3c64xx/mach-crag6410.c              |    4 ++--
  arch/arm/mach-s3c64xx/mach-hmt.c                   |    4 ++--
  arch/arm/mach-s3c64xx/mach-mini6410.c              |    4 ++--
  arch/arm/mach-s3c64xx/mach-ncp.c                   |    2 +-
  arch/arm/mach-s3c64xx/mach-real6410.c              |    4 ++--
  arch/arm/mach-s3c64xx/mach-smartq.c                |    8 ++++----
  arch/arm/mach-s3c64xx/mach-smdk6400.c              |    2 +-
  arch/arm/mach-s3c64xx/mach-smdk6410.c              |    6 +++---
  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-s5p64x0/dev-audio.c                  |    2 +-
  arch/arm/mach-s5p64x0/mach-smdk6440.c              |    4 ++--
  arch/arm/mach-s5p64x0/mach-smdk6450.c              |    4 ++--
  arch/arm/mach-s5p64x0/setup-i2c0.c                 |    2 +-
  arch/arm/mach-s5p64x0/setup-i2c1.c                 |    2 +-
  arch/arm/mach-s5pc100/dev-audio.c                  |    2 +-
  arch/arm/mach-s5pc100/mach-smdkc100.c              |    8 ++++----
  arch/arm/mach-s5pc100/setup-i2c0.c                 |    2 +-
  arch/arm/mach-s5pc100/setup-i2c1.c                 |    2 +-
  arch/arm/mach-s5pv210/dev-audio.c                  |    2 +-
  arch/arm/mach-s5pv210/mach-goni.c                  |    2 +-
Quoted 8 lines
  arch/arm/mach-s5pv210/mach-smdkc110.c              |    4 ++--
  arch/arm/mach-s5pv210/mach-smdkv210.c              |    6 +++---
  arch/arm/mach-s5pv210/mach-torbreck.c              |    2 +-
  arch/arm/mach-s5pv210/setup-i2c0.c                 |    2 +-
  arch/arm/mach-s5pv210/setup-i2c1.c                 |    2 +-
  arch/arm/mach-s5pv210/setup-i2c2.c                 |    2 +-
  arch/arm/plat-samsung/devs.c                       |   20 ++++++++++----------
  drivers/ata/pata_samsung_cf.c                      |    2 +-
Acked-by Jeff Garzik <[email protected]>
#72 lore raw

PATCH 15/16 ARM: samsung: move platform_data definitions

In reply to Arnd Bergmann

On Tuesday, September 11, 2012 10:03 PM Arnd Bergmann wrote

Quoted 148 lines

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 <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Mark Brown <[email protected]>
Cc Jeff Garzik <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc "Wolfram Sang (embedded platforms)" <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Bryan Wu <[email protected]>
Cc Richard Purdie <[email protected]>
Cc Sylwester Nawrocki <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Chris Ball <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Grant Likely <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Alan Stern <[email protected]>
Cc Sangbeom Kim <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc linux-samsung-soc at vger.kernel.org
---
 arch/arm/mach-exynos/dev-audio.c                   |    2 +-
 arch/arm/mach-exynos/dev-ohci.c                    |    2 +-
 arch/arm/mach-exynos/mach-nuri.c                   |    6 +++---
 arch/arm/mach-exynos/mach-origen.c                 |    6 +++---
 arch/arm/mach-exynos/mach-smdk4x12.c               |    2 +-
 arch/arm/mach-exynos/mach-smdkv310.c               |    6 +++---
 arch/arm/mach-exynos/mach-universal_c210.c         |    4 ++--
 arch/arm/mach-exynos/setup-i2c0.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c1.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c2.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c3.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c4.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c5.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c6.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c7.c                  |    2 +-
 arch/arm/mach-s3c24xx/common-smdk.c                |    4 ++--
 arch/arm/mach-s3c24xx/mach-amlm5900.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-anubis.c                |    6 +++---
 arch/arm/mach-s3c24xx/mach-at2440evb.c             |    6 +++---
 arch/arm/mach-s3c24xx/mach-bast.c                  |    8 ++++----
 arch/arm/mach-s3c24xx/mach-gta02.c                 |   10 +++++-----
 arch/arm/mach-s3c24xx/mach-h1940.c                 |    8 ++++----
 arch/arm/mach-s3c24xx/mach-jive.c                  |    6 +++---
 arch/arm/mach-s3c24xx/mach-mini2440.c              |   10 +++++-----
 arch/arm/mach-s3c24xx/mach-n30.c                   |    8 ++++----
 arch/arm/mach-s3c24xx/mach-nexcoder.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-osiris.c                |    4 ++--
 arch/arm/mach-s3c24xx/mach-otom.c                  |    2 +-
 arch/arm/mach-s3c24xx/mach-qt2410.c                |    8 ++++----
 arch/arm/mach-s3c24xx/mach-rx1950.c                |   10 +++++-----
 arch/arm/mach-s3c24xx/mach-rx3715.c                |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2410.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2413.c              |    4 ++--
 arch/arm/mach-s3c24xx/mach-smdk2416.c              |    8 ++++----
 arch/arm/mach-s3c24xx/mach-smdk2440.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2443.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-tct_hammer.c            |    2 +-
 arch/arm/mach-s3c24xx/mach-vr1000.c                |    6 +++---
 arch/arm/mach-s3c24xx/mach-vstms.c                 |    4 ++--
 arch/arm/mach-s3c24xx/setup-i2c.c                  |    2 +-
 arch/arm/mach-s3c24xx/simtec-audio.c               |    2 +-
 arch/arm/mach-s3c24xx/simtec-usb.c                 |    2 +-
 arch/arm/mach-s3c64xx/dev-audio.c                  |    2 +-
 arch/arm/mach-s3c64xx/mach-anw6410.c               |    2 +-
 arch/arm/mach-s3c64xx/mach-crag6410-module.c       |    2 +-
 arch/arm/mach-s3c64xx/mach-crag6410.c              |    4 ++--
 arch/arm/mach-s3c64xx/mach-hmt.c                   |    4 ++--
 arch/arm/mach-s3c64xx/mach-mini6410.c              |    4 ++--
 arch/arm/mach-s3c64xx/mach-ncp.c                   |    2 +-
 arch/arm/mach-s3c64xx/mach-real6410.c              |    4 ++--
 arch/arm/mach-s3c64xx/mach-smartq.c                |    8 ++++----
 arch/arm/mach-s3c64xx/mach-smdk6400.c              |    2 +-
 arch/arm/mach-s3c64xx/mach-smdk6410.c              |    6 +++---
 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-s5p64x0/dev-audio.c                  |    2 +-
 arch/arm/mach-s5p64x0/mach-smdk6440.c              |    4 ++--
 arch/arm/mach-s5p64x0/mach-smdk6450.c              |    4 ++--
 arch/arm/mach-s5p64x0/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5p64x0/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pc100/dev-audio.c                  |    2 +-
 arch/arm/mach-s5pc100/mach-smdkc100.c              |    8 ++++----
 arch/arm/mach-s5pc100/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5pc100/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pv210/dev-audio.c                  |    2 +-
 arch/arm/mach-s5pv210/mach-goni.c                  |    2 +-
 arch/arm/mach-s5pv210/mach-smdkc110.c              |    4 ++--
 arch/arm/mach-s5pv210/mach-smdkv210.c              |    6 +++---
 arch/arm/mach-s5pv210/mach-torbreck.c              |    2 +-
 arch/arm/mach-s5pv210/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5pv210/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pv210/setup-i2c2.c                 |    2 +-
 arch/arm/plat-samsung/devs.c                       |   20 ++++++++++----------
 drivers/ata/pata_samsung_cf.c                      |    2 +-
 drivers/hwmon/s3c-hwmon.c                          |    2 +-
 drivers/i2c/busses/i2c-s3c2410.c                   |    2 +-
 drivers/input/touchscreen/s3c2410_ts.c             |    2 +-
 drivers/leds/leds-s3c24xx.c                        |    2 +-
 drivers/media/video/s5p-fimc/mipi-csis.c           |    2 +-
 drivers/mmc/host/s3cmci.c                          |    2 +-
 drivers/mtd/nand/s3c2410.c                         |    2 +-
 drivers/spi/spi-s3c64xx.c                          |    2 +-
 drivers/usb/gadget/s3c2410_udc.c                   |    2 +-
 drivers/usb/host/ehci-s5p.c                        |    2 +-
 drivers/usb/host/ohci-exynos.c                     |    2 +-
 drivers/usb/host/ohci-s3c2410.c                    |    2 +-
 .../linux/platform_data/asoc-s3c.h                 |    0
 .../linux/platform_data/asoc-s3c24xx_simtec.h      |    0
 .../linux/platform_data/ata-samsung_cf.h           |    0
 .../linux/platform_data/hwmon-s3c.h                |    0
 .../linux/platform_data/i2c-s3c2410.h              |    0
 .../linux/platform_data/leds-s3c24xx.h             |    0
 .../linux/platform_data/mipi-csis.h                |    0
 .../linux/platform_data/mmc-s3cmci.h               |    0
 .../linux/platform_data/mtd-nand-s3c2410.h         |    0
 .../linux/platform_data/spi-s3c64xx.h              |    0
 .../linux/platform_data/touchscreen-s3c2410.h      |    0
 .../linux/platform_data/usb-ehci-s5p.h             |    0
 .../linux/platform_data/usb-exynos.h               |    0
 .../linux/platform_data/usb-ohci-s3c2410.h         |    0
 .../linux/platform_data/usb-s3c2410_udc.h          |    0
 sound/soc/samsung/ac97.c                           |    2 +-
 sound/soc/samsung/i2s.c                            |    2 +-
 sound/soc/samsung/pcm.c                            |    2 +-
 sound/soc/samsung/s3c24xx_simtec.c                 |    2 +-
 sound/soc/samsung/spdif.c                          |    2 +-
 107 files changed, 164 insertions(+), 164 deletions(-)
 rename arch/arm/plat-samsung/include/plat/audio.h => include/linux/platform_data/asoc-s3c.h (100%)
 rename arch/arm/plat-samsung/include/plat/audio-simtec.h => include/linux/platform_data/asoc-
s3c24xx_simtec.h (100%)
 rename arch/arm/plat-samsung/include/plat/ata.h => include/linux/platform_data/ata-samsung_cf.h (100%)
 rename arch/arm/plat-samsung/include/plat/hwmon.h => include/linux/platform_data/hwmon-s3c.h (100%)
 rename arch/arm/plat-samsung/include/plat/iic.h => include/linux/platform_data/i2c-s3c2410.h (100%)
 rename arch/arm/mach-s3c24xx/include/mach/leds-gpio.h => include/linux/platform_data/leds-s3c24xx.h
(100%)
 rename arch/arm/plat-samsung/include/plat/mipi_csis.h => include/linux/platform_data/mipi-csis.h (100%)
 rename arch/arm/plat-samsung/include/plat/mci.h => include/linux/platform_data/mmc-s3cmci.h (100%)
Quoted 8 lines
 rename arch/arm/plat-samsung/include/plat/nand.h => include/linux/platform_data/mtd-nand-s3c2410.h
(100%)
 rename arch/arm/plat-samsung/include/plat/s3c64xx-spi.h => include/linux/platform_data/spi-s3c64xx.h
(100%)
 rename arch/arm/plat-samsung/include/plat/ts.h => include/linux/platform_data/touchscreen-s3c2410.h
(100%)
 rename arch/arm/plat-samsung/include/plat/ehci.h => include/linux/platform_data/usb-ehci-s5p.h (100%)
 rename arch/arm/mach-exynos/include/mach/ohci.h => include/linux/platform_data/usb-exynos.h (100%)

Hi Arnd Bergmann,

Could you change the name from 'ohci.h' to 'usb-ohci-exynos.h', instead of 'usb-exynos.h'? This is because 'ohci.h' has the platdata for only exynos ohci.

Best regards,
Jingoo Han

Quoted 4 lines
 rename arch/arm/plat-samsung/include/plat/usb-control.h => include/linux/platform_data/usb-ohci-
s3c2410.h (100%)
 rename arch/arm/plat-samsung/include/plat/udc.h => include/linux/platform_data/usb-s3c2410_udc.h (100%)
Acked-by on v1 15/16
#73 lore raw

RE: [PATCH 15/16] ARM: samsung: move platform_data definitions

In reply to Arnd Bergmann
Quoted 9 lines · Arnd Bergmann

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 <[email protected]>
Cc Kukjin Kim <[email protected]>

Yeah, basically looks OK on this.

Acked-by Kukjin Kim <[email protected]>

BTW, how about re-ordering inclusion <linux/platform_data/xxx.h> after <linux/xxx.h> rather than just replacing like following?

---
#include <linux/xxx.h>
...
#include <linux/platform_data/xxx.h>
...
#include <mach/xxx.h>
...
#include <plat/xxx.h>
...
---

And there are small comments...

Quoted 87 lines
Cc Kyungmin Park <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Mark Brown <[email protected]>
Cc Jeff Garzik <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc "Wolfram Sang (embedded platforms)" <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Bryan Wu <[email protected]>
Cc Richard Purdie <[email protected]>
Cc Sylwester Nawrocki <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Chris Ball <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Grant Likely <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Alan Stern <[email protected]>
Cc Sangbeom Kim <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc linux-samsung-soc at vger.kernel.org
---
 arch/arm/mach-exynos/dev-audio.c                   |    2 +-
 arch/arm/mach-exynos/dev-ohci.c                    |    2 +-
 arch/arm/mach-exynos/mach-nuri.c                   |    6 +++---
 arch/arm/mach-exynos/mach-origen.c                 |    6 +++---
 arch/arm/mach-exynos/mach-smdk4x12.c               |    2 +-
 arch/arm/mach-exynos/mach-smdkv310.c               |    6 +++---
 arch/arm/mach-exynos/mach-universal_c210.c         |    4 ++--
 arch/arm/mach-exynos/setup-i2c0.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c1.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c2.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c3.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c4.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c5.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c6.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c7.c                  |    2 +-
 arch/arm/mach-s3c24xx/common-smdk.c                |    4 ++--
 arch/arm/mach-s3c24xx/mach-amlm5900.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-anubis.c                |    6 +++---
 arch/arm/mach-s3c24xx/mach-at2440evb.c             |    6 +++---
 arch/arm/mach-s3c24xx/mach-bast.c                  |    8 ++++----
 arch/arm/mach-s3c24xx/mach-gta02.c                 |   10 +++++-----
 arch/arm/mach-s3c24xx/mach-h1940.c                 |    8 ++++----
 arch/arm/mach-s3c24xx/mach-jive.c                  |    6 +++---
 arch/arm/mach-s3c24xx/mach-mini2440.c              |   10 +++++-----
 arch/arm/mach-s3c24xx/mach-n30.c                   |    8 ++++----
 arch/arm/mach-s3c24xx/mach-nexcoder.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-osiris.c                |    4 ++--
 arch/arm/mach-s3c24xx/mach-otom.c                  |    2 +-
 arch/arm/mach-s3c24xx/mach-qt2410.c                |    8 ++++----
 arch/arm/mach-s3c24xx/mach-rx1950.c                |   10 +++++-----
 arch/arm/mach-s3c24xx/mach-rx3715.c                |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2410.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2413.c              |    4 ++--
 arch/arm/mach-s3c24xx/mach-smdk2416.c              |    8 ++++----
 arch/arm/mach-s3c24xx/mach-smdk2440.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2443.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-tct_hammer.c            |    2 +-
 arch/arm/mach-s3c24xx/mach-vr1000.c                |    6 +++---
 arch/arm/mach-s3c24xx/mach-vstms.c                 |    4 ++--
 arch/arm/mach-s3c24xx/setup-i2c.c                  |    2 +-
 arch/arm/mach-s3c24xx/simtec-audio.c               |    2 +-
 arch/arm/mach-s3c24xx/simtec-usb.c                 |    2 +-
 arch/arm/mach-s3c64xx/dev-audio.c                  |    2 +-
 arch/arm/mach-s3c64xx/mach-anw6410.c               |    2 +-
 arch/arm/mach-s3c64xx/mach-crag6410-module.c       |    2 +-
 arch/arm/mach-s3c64xx/mach-crag6410.c              |    4 ++--
 arch/arm/mach-s3c64xx/mach-hmt.c                   |    4 ++--
 arch/arm/mach-s3c64xx/mach-mini6410.c              |    4 ++--
 arch/arm/mach-s3c64xx/mach-ncp.c                   |    2 +-
 arch/arm/mach-s3c64xx/mach-real6410.c              |    4 ++--
 arch/arm/mach-s3c64xx/mach-smartq.c                |    8 ++++----
 arch/arm/mach-s3c64xx/mach-smdk6400.c              |    2 +-
 arch/arm/mach-s3c64xx/mach-smdk6410.c              |    6 +++---
 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-s5p64x0/dev-audio.c                  |    2 +-
 arch/arm/mach-s5p64x0/mach-smdk6440.c              |    4 ++--
 arch/arm/mach-s5p64x0/mach-smdk6450.c              |    4 ++--
 arch/arm/mach-s5p64x0/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5p64x0/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pc100/dev-audio.c                  |    2 +-
 arch/arm/mach-s5pc100/mach-smdkc100.c              |    8 ++++----
 arch/arm/mach-s5pc100/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5pc100/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pv210/dev-audio.c                  |    2 +-
Quoted 8 lines
 arch/arm/mach-s5pv210/mach-goni.c                  |    2 +-
 arch/arm/mach-s5pv210/mach-smdkc110.c              |    4 ++--
 arch/arm/mach-s5pv210/mach-smdkv210.c              |    6 +++---
 arch/arm/mach-s5pv210/mach-torbreck.c              |    2 +-
 arch/arm/mach-s5pv210/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5pv210/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pv210/setup-i2c2.c                 |    2 +-
 arch/arm/plat-samsung/devs.c                       |   20

++++++++++----------

Quoted 35 lines
 drivers/ata/pata_samsung_cf.c                      |    2 +-
 drivers/hwmon/s3c-hwmon.c                          |    2 +-
 drivers/i2c/busses/i2c-s3c2410.c                   |    2 +-
 drivers/input/touchscreen/s3c2410_ts.c             |    2 +-
 drivers/leds/leds-s3c24xx.c                        |    2 +-
 drivers/media/video/s5p-fimc/mipi-csis.c           |    2 +-
 drivers/mmc/host/s3cmci.c                          |    2 +-
 drivers/mtd/nand/s3c2410.c                         |    2 +-
 drivers/spi/spi-s3c64xx.c                          |    2 +-
 drivers/usb/gadget/s3c2410_udc.c                   |    2 +-
 drivers/usb/host/ehci-s5p.c                        |    2 +-
 drivers/usb/host/ohci-exynos.c                     |    2 +-
 drivers/usb/host/ohci-s3c2410.c                    |    2 +-
 .../linux/platform_data/asoc-s3c.h                 |    0
 .../linux/platform_data/asoc-s3c24xx_simtec.h      |    0
 .../linux/platform_data/ata-samsung_cf.h           |    0
 .../linux/platform_data/hwmon-s3c.h                |    0
 .../linux/platform_data/i2c-s3c2410.h              |    0
 .../linux/platform_data/leds-s3c24xx.h             |    0
 .../linux/platform_data/mipi-csis.h                |    0
 .../linux/platform_data/mmc-s3cmci.h               |    0
 .../linux/platform_data/mtd-nand-s3c2410.h         |    0
 .../linux/platform_data/spi-s3c64xx.h              |    0
 .../linux/platform_data/touchscreen-s3c2410.h      |    0
 .../linux/platform_data/usb-ehci-s5p.h             |    0
 .../linux/platform_data/usb-exynos.h               |    0
 .../linux/platform_data/usb-ohci-s3c2410.h         |    0
 .../linux/platform_data/usb-s3c2410_udc.h          |    0
 sound/soc/samsung/ac97.c                           |    2 +-
 sound/soc/samsung/i2s.c                            |    2 +-
 sound/soc/samsung/pcm.c                            |    2 +-
 sound/soc/samsung/s3c24xx_simtec.c                 |    2 +-
 sound/soc/samsung/spdif.c                          |    2 +-
 107 files changed, 164 insertions(+), 164 deletions(-)
 rename arch/arm/plat-samsung/include/plat/audio.h =>
Quoted 1 line

include/linux/platform_data/asoc-s3c.h (100%)

I'd prefer asoc-samsung.h and...

Quoted 2 lines
 rename arch/arm/plat-samsung/include/plat/audio-simtec.h =>

include/linux/platform_data/asoc-s3c24xx_simtec.h (100%)

This will be merged into above header.

arch/arm/plat-samsung/include/plat/audio-simtec.h | 34 ----------------

 .../linux/platform_data/asoc-samsung.h             |   42
++++++++++++++++---
 2 files changed, 35 insertions(+), 41 deletions(-)
 delete mode 100644 arch/arm/plat-samsung/include/plat/audio-simtec.h
 rename arch/arm/plat-samsung/include/plat/audio.h =>

include/linux/platform_data/asoc-samsung.h (63%)

(quoted diff) +0 -0

b/arch/arm/plat-samsung/include/plat/audio-simtec.h deleted file mode 100644
index 376af52..0000000

arch/arm/plat-samsung/include/plat/audio-simtec.h deleted +0 -34
@@ -1,34 +0,0 @@
-/* arch/arm/plat-samsung/include/plat/audio-simtec.h
- *
- * Copyright 2008 Simtec Electronics
- *	http://armlinux.simtec.co.uk/
- *	Ben Dooks <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Simtec Audio support.
-*/
-
-/**
- * struct s3c24xx_audio_simtec_pdata - platform data for simtec audio
- * @use_mpllin: Select codec clock from MPLLin
- * @output_cdclk: Need to output CDCLK to the codec
- * @have_mic: Set if we have a MIC socket
- * @have_lout: Set if we have a LineOut socket
- * @amp_gpio: GPIO pin to enable the AMP
- * @amp_gain: Option GPIO to control AMP gain
- */
-struct s3c24xx_audio_simtec_pdata {
-	unsigned int	use_mpllin:1;
-	unsigned int	output_cdclk:1;
-
-	unsigned int	have_mic:1;
-	unsigned int	have_lout:1;
-
-	int		amp_gpio;
-	int		amp_gain[2];
-
-	void	(*startup)(void);
-};
(quoted diff) +0 -0

b/include/linux/platform_data/asoc-samsung.h similarity index 63%
rename from arch/arm/plat-samsung/include/plat/audio.h rename to include/linux/platform_data/asoc-samsung.h index aa9875f..6b1d947 100644

include/linux/platform_data/asoc-samsung.h renamed from arch/arm/plat-samsung/include/plat/audio.h +35 -7

63 lines not on this page · raw message

--

And I think, need to check what header name is better like following?...But if any policy on the naming, I'm OK :-)

Quoted 2 lines
 rename arch/arm/plat-samsung/include/plat/ata.h =>

include/linux/platform_data/ata-samsung_cf.h (100%)

ata-samsung.h?

Quoted 2 lines
 rename arch/arm/plat-samsung/include/plat/hwmon.h =>

include/linux/platform_data/hwmon-s3c.h (100%)

s3c-hwmon.h?

Quoted 13 lines
 rename arch/arm/plat-samsung/include/plat/iic.h =>
include/linux/platform_data/i2c-s3c2410.h (100%)
 rename arch/arm/mach-s3c24xx/include/mach/leds-gpio.h =>
include/linux/platform_data/leds-s3c24xx.h (100%)
 rename arch/arm/plat-samsung/include/plat/mipi_csis.h =>
include/linux/platform_data/mipi-csis.h (100%)
 rename arch/arm/plat-samsung/include/plat/mci.h =>
include/linux/platform_data/mmc-s3cmci.h (100%)
 rename arch/arm/plat-samsung/include/plat/nand.h =>
include/linux/platform_data/mtd-nand-s3c2410.h (100%)
 rename arch/arm/plat-samsung/include/plat/s3c64xx-spi.h =>
include/linux/platform_data/spi-s3c64xx.h (100%)
 rename arch/arm/plat-samsung/include/plat/ts.h =>
Quoted 1 line

include/linux/platform_data/touchscreen-s3c2410.h (100%)

s3c2410-ts.h?

Quoted 4 lines
 rename arch/arm/plat-samsung/include/plat/ehci.h =>
include/linux/platform_data/usb-ehci-s5p.h (100%)
 rename arch/arm/mach-exynos/include/mach/ohci.h =>

include/linux/platform_data/usb-exynos.h (100%)

usb-ohci-exynos.h?

Quoted 5 lines
 rename arch/arm/plat-samsung/include/plat/usb-control.h =>
include/linux/platform_data/usb-ohci-s3c2410.h (100%)
 rename arch/arm/plat-samsung/include/plat/udc.h =>

include/linux/platform_data/usb-s3c2410_udc.h (100%)

And just note that conflicts will be happened when merge this into Samsung tree.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

Acked-by on v1 15/16
#74 lore raw

Re: [PATCH 15/16] ARM: samsung: move platform_data definitions

In reply to Arnd Bergmann
Quoted 9 lines · Arnd Bergmann

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 <[email protected]>
Cc Kukjin Kim <[email protected]>
Cc Kyungmin Park <[email protected]>
Acked-by Kyungmin Park <[email protected]>
Quoted 1,803 lines
Cc Ben Dooks <[email protected]>
Cc Mark Brown <[email protected]>
Cc Jeff Garzik <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc "Wolfram Sang (embedded platforms)" <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Bryan Wu <[email protected]>
Cc Richard Purdie <[email protected]>
Cc Sylwester Nawrocki <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Chris Ball <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Grant Likely <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Alan Stern <[email protected]>
Cc Sangbeom Kim <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc linux-samsung-soc at vger.kernel.org
---
 arch/arm/mach-exynos/dev-audio.c                   |    2 +-
 arch/arm/mach-exynos/dev-ohci.c                    |    2 +-
 arch/arm/mach-exynos/mach-nuri.c                   |    6 +++---
 arch/arm/mach-exynos/mach-origen.c                 |    6 +++---
 arch/arm/mach-exynos/mach-smdk4x12.c               |    2 +-
 arch/arm/mach-exynos/mach-smdkv310.c               |    6 +++---
 arch/arm/mach-exynos/mach-universal_c210.c         |    4 ++--
 arch/arm/mach-exynos/setup-i2c0.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c1.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c2.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c3.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c4.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c5.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c6.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c7.c                  |    2 +-
 arch/arm/mach-s3c24xx/common-smdk.c                |    4 ++--
 arch/arm/mach-s3c24xx/mach-amlm5900.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-anubis.c                |    6 +++---
 arch/arm/mach-s3c24xx/mach-at2440evb.c             |    6 +++---
 arch/arm/mach-s3c24xx/mach-bast.c                  |    8 ++++----
 arch/arm/mach-s3c24xx/mach-gta02.c                 |   10 +++++-----
 arch/arm/mach-s3c24xx/mach-h1940.c                 |    8 ++++----
 arch/arm/mach-s3c24xx/mach-jive.c                  |    6 +++---
 arch/arm/mach-s3c24xx/mach-mini2440.c              |   10 +++++-----
 arch/arm/mach-s3c24xx/mach-n30.c                   |    8 ++++----
 arch/arm/mach-s3c24xx/mach-nexcoder.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-osiris.c                |    4 ++--
 arch/arm/mach-s3c24xx/mach-otom.c                  |    2 +-
 arch/arm/mach-s3c24xx/mach-qt2410.c                |    8 ++++----
 arch/arm/mach-s3c24xx/mach-rx1950.c                |   10 +++++-----
 arch/arm/mach-s3c24xx/mach-rx3715.c                |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2410.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2413.c              |    4 ++--
 arch/arm/mach-s3c24xx/mach-smdk2416.c              |    8 ++++----
 arch/arm/mach-s3c24xx/mach-smdk2440.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2443.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-tct_hammer.c            |    2 +-
 arch/arm/mach-s3c24xx/mach-vr1000.c                |    6 +++---
 arch/arm/mach-s3c24xx/mach-vstms.c                 |    4 ++--
 arch/arm/mach-s3c24xx/setup-i2c.c                  |    2 +-
 arch/arm/mach-s3c24xx/simtec-audio.c               |    2 +-
 arch/arm/mach-s3c24xx/simtec-usb.c                 |    2 +-
 arch/arm/mach-s3c64xx/dev-audio.c                  |    2 +-
 arch/arm/mach-s3c64xx/mach-anw6410.c               |    2 +-
 arch/arm/mach-s3c64xx/mach-crag6410-module.c       |    2 +-
 arch/arm/mach-s3c64xx/mach-crag6410.c              |    4 ++--
 arch/arm/mach-s3c64xx/mach-hmt.c                   |    4 ++--
 arch/arm/mach-s3c64xx/mach-mini6410.c              |    4 ++--
 arch/arm/mach-s3c64xx/mach-ncp.c                   |    2 +-
 arch/arm/mach-s3c64xx/mach-real6410.c              |    4 ++--
 arch/arm/mach-s3c64xx/mach-smartq.c                |    8 ++++----
 arch/arm/mach-s3c64xx/mach-smdk6400.c              |    2 +-
 arch/arm/mach-s3c64xx/mach-smdk6410.c              |    6 +++---
 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-s5p64x0/dev-audio.c                  |    2 +-
 arch/arm/mach-s5p64x0/mach-smdk6440.c              |    4 ++--
 arch/arm/mach-s5p64x0/mach-smdk6450.c              |    4 ++--
 arch/arm/mach-s5p64x0/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5p64x0/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pc100/dev-audio.c                  |    2 +-
 arch/arm/mach-s5pc100/mach-smdkc100.c              |    8 ++++----
 arch/arm/mach-s5pc100/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5pc100/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pv210/dev-audio.c                  |    2 +-
 arch/arm/mach-s5pv210/mach-goni.c                  |    2 +-
 arch/arm/mach-s5pv210/mach-smdkc110.c              |    4 ++--
 arch/arm/mach-s5pv210/mach-smdkv210.c              |    6 +++---
 arch/arm/mach-s5pv210/mach-torbreck.c              |    2 +-
 arch/arm/mach-s5pv210/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5pv210/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pv210/setup-i2c2.c                 |    2 +-
 arch/arm/plat-samsung/devs.c                       |   20
++++++++++----------
 drivers/ata/pata_samsung_cf.c                      |    2 +-
 drivers/hwmon/s3c-hwmon.c                          |    2 +-
 drivers/i2c/busses/i2c-s3c2410.c                   |    2 +-
 drivers/input/touchscreen/s3c2410_ts.c             |    2 +-
 drivers/leds/leds-s3c24xx.c                        |    2 +-
 drivers/media/video/s5p-fimc/mipi-csis.c           |    2 +-
 drivers/mmc/host/s3cmci.c                          |    2 +-
 drivers/mtd/nand/s3c2410.c                         |    2 +-
 drivers/spi/spi-s3c64xx.c                          |    2 +-
 drivers/usb/gadget/s3c2410_udc.c                   |    2 +-
 drivers/usb/host/ehci-s5p.c                        |    2 +-
 drivers/usb/host/ohci-exynos.c                     |    2 +-
 drivers/usb/host/ohci-s3c2410.c                    |    2 +-
 .../linux/platform_data/asoc-s3c.h                 |    0
 .../linux/platform_data/asoc-s3c24xx_simtec.h      |    0
 .../linux/platform_data/ata-samsung_cf.h           |    0
 .../linux/platform_data/hwmon-s3c.h                |    0
 .../linux/platform_data/i2c-s3c2410.h              |    0
 .../linux/platform_data/leds-s3c24xx.h             |    0
 .../linux/platform_data/mipi-csis.h                |    0
 .../linux/platform_data/mmc-s3cmci.h               |    0
 .../linux/platform_data/mtd-nand-s3c2410.h         |    0
 .../linux/platform_data/spi-s3c64xx.h              |    0
 .../linux/platform_data/touchscreen-s3c2410.h      |    0
 .../linux/platform_data/usb-ehci-s5p.h             |    0
 .../linux/platform_data/usb-exynos.h               |    0
 .../linux/platform_data/usb-ohci-s3c2410.h         |    0
 .../linux/platform_data/usb-s3c2410_udc.h          |    0
 sound/soc/samsung/ac97.c                           |    2 +-
 sound/soc/samsung/i2s.c                            |    2 +-
 sound/soc/samsung/pcm.c                            |    2 +-
 sound/soc/samsung/s3c24xx_simtec.c                 |    2 +-
 sound/soc/samsung/spdif.c                          |    2 +-
 107 files changed, 164 insertions(+), 164 deletions(-)
 rename arch/arm/plat-samsung/include/plat/audio.h =>
include/linux/platform_data/asoc-s3c.h (100%)
 rename arch/arm/plat-samsung/include/plat/audio-simtec.h =>
include/linux/platform_data/asoc-s3c24xx_simtec.h (100%)
 rename arch/arm/plat-samsung/include/plat/ata.h =>
include/linux/platform_data/ata-samsung_cf.h (100%)
 rename arch/arm/plat-samsung/include/plat/hwmon.h =>
include/linux/platform_data/hwmon-s3c.h (100%)
 rename arch/arm/plat-samsung/include/plat/iic.h =>
include/linux/platform_data/i2c-s3c2410.h (100%)
 rename arch/arm/mach-s3c24xx/include/mach/leds-gpio.h =>
include/linux/platform_data/leds-s3c24xx.h (100%)
 rename arch/arm/plat-samsung/include/plat/mipi_csis.h =>
include/linux/platform_data/mipi-csis.h (100%)
 rename arch/arm/plat-samsung/include/plat/mci.h =>
include/linux/platform_data/mmc-s3cmci.h (100%)
 rename arch/arm/plat-samsung/include/plat/nand.h =>
include/linux/platform_data/mtd-nand-s3c2410.h (100%)
 rename arch/arm/plat-samsung/include/plat/s3c64xx-spi.h =>
include/linux/platform_data/spi-s3c64xx.h (100%)
 rename arch/arm/plat-samsung/include/plat/ts.h =>
include/linux/platform_data/touchscreen-s3c2410.h (100%)
 rename arch/arm/plat-samsung/include/plat/ehci.h =>
include/linux/platform_data/usb-ehci-s5p.h (100%)
 rename arch/arm/mach-exynos/include/mach/ohci.h =>
include/linux/platform_data/usb-exynos.h (100%)
 rename arch/arm/plat-samsung/include/plat/usb-control.h =>
include/linux/platform_data/usb-ohci-s3c2410.h (100%)
 rename arch/arm/plat-samsung/include/plat/udc.h =>

include/linux/platform_data/usb-s3c2410_udc.h (100%)

arch/arm/mach-exynos/dev-audio.c +1 -1
index b33a5b6..ae321c7 100644
@@ -16,7 +16,7 @@
 #include <linux/gpio.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include <mach/map.h>
 #include <mach/dma.h>
arch/arm/mach-exynos/dev-ohci.c +1 -1
index b8e7530..14ed795 100644
@@ -15,7 +15,7 @@
 
 #include <mach/irqs.h>
 #include <mach/map.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/usb-exynos.h>
 
 #include <plat/devs.h>
 #include <plat/usb-phy.h>
arch/arm/mach-exynos/mach-nuri.c +3 -3
index ea785fc..393d2ce 100644
@@ -45,14 +45,14 @@
 #include <plat/devs.h>
 #include <plat/fb.h>
 #include <plat/sdhci.h>
-#include <plat/ehci.h>
+#include <linux/platform_data/usb-ehci-s5p.h>
 #include <plat/clock.h>
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/mfc.h>
 #include <plat/fimc-core.h>
 #include <plat/camport.h>
-#include <plat/mipi_csis.h>
+#include <linux/platform_data/mipi-csis.h>
 
 #include <mach/map.h>
arch/arm/mach-exynos/mach-origen.c +3 -3
index 5ca8030..4a531dc 100644
@@ -35,15 +35,15 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/sdhci.h>
-#include <plat/iic.h>
-#include <plat/ehci.h>
+#include <linux/platform_data/i2c-s3c2410.h>
+#include <linux/platform_data/usb-ehci-s5p.h>
 #include <plat/clock.h>
 #include <plat/gpio-cfg.h>
 #include <plat/backlight.h>
 #include <plat/fb.h>
 #include <plat/mfc.h>
 
-#include <mach/ohci.h>
+#include <linux/platform_data/usb-exynos.h>
 #include <mach/map.h>
 
 #include <drm/exynos_drm.h>
arch/arm/mach-exynos/mach-smdk4x12.c +1 -1
index b26beb1..6a791fd 100644
@@ -32,7 +32,7 @@
 #include <plat/devs.h>
 #include <plat/fb.h>
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/keypad.h>
 #include <plat/mfc.h>
 #include <plat/regs-fb.h>
arch/arm/mach-exynos/mach-smdkv310.c +3 -3
index 3cfa688..fa2ada6 100644
@@ -34,15 +34,15 @@
 #include <plat/fb.h>
 #include <plat/keypad.h>
 #include <plat/sdhci.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 #include <plat/backlight.h>
 #include <plat/mfc.h>
-#include <plat/ehci.h>
+#include <linux/platform_data/usb-ehci-s5p.h>
 #include <plat/clock.h>
 
 #include <mach/map.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/usb-exynos.h>
 
 #include <drm/exynos_drm.h>
 #include "common.h"
arch/arm/mach-exynos/mach-universal_c210.c +2 -2
index 4d1f40d..bc49e5a 100644
@@ -34,7 +34,7 @@
 #include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 #include <plat/fb.h>
 #include <plat/mfc.h>

@@ -43,7 +43,7 @@
 #include <plat/fimc-core.h>
 #include <plat/s5p-time.h>
 #include <plat/camport.h>
-#include <plat/mipi_csis.h>
+#include <linux/platform_data/mipi-csis.h>
 
 #include <mach/map.h>
arch/arm/mach-exynos/setup-i2c0.c +1 -1
index b90d94c..5700f23 100644
@@ -14,7 +14,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 #include <plat/cpu.h>
arch/arm/mach-exynos/setup-i2c1.c +1 -1
index fd7235a..8d2279c 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c1_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c2.c +1 -1
index 2694b19..0ed62fc 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c2_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c3.c +1 -1
index 379bd30..7787fd2 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c3_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c4.c +1 -1
index 9f3c048..edc847f 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c4_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c5.c +1 -1
index 77e1a1e..d88af7f 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c5_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c6.c +1 -1
index 284d12b..c590286 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c6_cfg_gpio(struct platform_device *dev)
arch/arm/mach-exynos/setup-i2c7.c +1 -1
index b7611ee..1bba755 100644
@@ -13,7 +13,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c7_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s3c24xx/common-smdk.c +2 -2
index 87e75a2..3b2cf6d 100644
@@ -37,9 +37,9 @@
 #include <asm/irq.h>
 
 #include <mach/regs-gpio.h>
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 
 #include <plat/common-smdk.h>
 #include <plat/gpio-cfg.h>
arch/arm/mach-s3c24xx/mach-amlm5900.c +1 -1
index ea2c4b00..f4ad99c 100644
@@ -53,7 +53,7 @@
 #include <mach/regs-lcd.h>
 #include <mach/regs-gpio.h>
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/gpio-cfg.h>
arch/arm/mach-s3c24xx/mach-anubis.c +3 -3
index 5a7d0c0..df890fb 100644
@@ -40,8 +40,8 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>

@@ -53,7 +53,7 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/audio-simtec.h>
+#include <linux/platform_data/asoc-s3c24xx_simtec.h>
 
 #include "simtec.h"
 #include "common.h"
arch/arm/mach-s3c24xx/mach-at2440evb.c +3 -3
index 7a05abf..00381fe 100644
@@ -36,8 +36,8 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>

@@ -47,7 +47,7 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/mci.h>
+#include <linux/platform_data/mmc-s3cmci.h>
 
 #include "common.h"
arch/arm/mach-s3c24xx/mach-bast.c +4 -4
index 1cf1720..6a30ce7 100644
@@ -45,9 +45,9 @@
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
 
-#include <plat/hwmon.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/hwmon-s3c.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <mach/fb.h>
 
 #include <linux/mtd/mtd.h>

@@ -62,7 +62,7 @@
 #include <plat/cpu.h>
 #include <plat/cpu-freq.h>
 #include <plat/gpio-cfg.h>
-#include <plat/audio-simtec.h>
+#include <linux/platform_data/asoc-s3c24xx_simtec.h>
 
 #include "simtec.h"
 #include "common.h"
arch/arm/mach-s3c24xx/mach-gta02.c +5 -5
index 92e1f93..4a96346 100644
@@ -73,21 +73,21 @@
 #include <mach/regs-gpio.h>
 #include <mach/fb.h>
 
-#include <plat/usb-control.h>
+#include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <mach/regs-mem.h>
 #include <mach/hardware.h>
 
 #include <mach/gta02.h>
 
 #include <plat/regs-serial.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>
-#include <plat/udc.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
-#include <plat/ts.h>
+#include <linux/platform_data/i2c-s3c2410.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 
 #include "common.h"
arch/arm/mach-s3c24xx/mach-h1940.c +4 -4
index bb8d008..9638b33 100644
@@ -56,8 +56,8 @@
 #include <mach/h1940.h>
 #include <mach/h1940-latch.h>
 #include <mach/fb.h>
-#include <plat/udc.h>
-#include <plat/iic.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/gpio-cfg.h>
 #include <plat/clock.h>

@@ -65,8 +65,8 @@
 #include <plat/cpu.h>
 #include <plat/pll.h>
 #include <plat/pm.h>
-#include <plat/mci.h>
-#include <plat/ts.h>
+#include <linux/platform_data/mmc-s3cmci.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 
 #include <sound/uda1380.h>
arch/arm/mach-s3c24xx/mach-jive.c +3 -3
index ae73ba3..28ad25b 100644
@@ -32,8 +32,8 @@
 #include <asm/mach/irq.h>
 
 #include <plat/regs-serial.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <mach/regs-power.h>
 #include <mach/regs-gpio.h>

@@ -54,7 +54,7 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>
-#include <plat/udc.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
 
 static struct map_desc jive_iodesc[] __initdata = {
 };
arch/arm/mach-s3c24xx/mach-mini2440.c +5 -5
index bd6d252..c676b8e 100644
@@ -39,14 +39,14 @@
 
 #include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
 #include <mach/irqs.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
-#include <plat/mci.h>
-#include <plat/udc.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/mtd/mtd.h>
 #include <linux/mtd/nand.h>
arch/arm/mach-s3c24xx/mach-n30.c +4 -4
index 383d00c..c53a9bf 100644
@@ -33,7 +33,7 @@
 #include <asm/mach-types.h>
 
 #include <mach/fb.h>
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
 

@@ -41,15 +41,15 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/regs-serial.h>
 
 #include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/mci.h>
+#include <linux/platform_data/mmc-s3cmci.h>
 #include <plat/s3c2410.h>
-#include <plat/udc.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
 
 #include "common.h"
arch/arm/mach-s3c24xx/mach-nexcoder.c +1 -1
index 5c05ba1..7841321 100644
@@ -38,7 +38,7 @@
 //#include <asm/debug-ll.h>
 #include <mach/regs-gpio.h>
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/gpio-cfg.h>
 #include <plat/s3c2410.h>
arch/arm/mach-s3c24xx/mach-osiris.c +2 -2
index 95d0772..63c20019 100644
@@ -41,8 +41,8 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
arch/arm/mach-s3c24xx/mach-otom.c +1 -1
index bc4b6ef..bca39f0 100644
@@ -35,7 +35,7 @@
 #include <plat/s3c2410.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/cpu.h>
 
 #include "common.h"
arch/arm/mach-s3c24xx/mach-qt2410.c +4 -4
index 678bbca..7b6ba13 100644
@@ -47,13 +47,13 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 #include <mach/regs-lcd.h>
 #include <plat/regs-serial.h>
 #include <mach/fb.h>
-#include <plat/nand.h>
-#include <plat/udc.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/common-smdk.h>
 #include <plat/gpio-cfg.h>
arch/arm/mach-s3c24xx/mach-rx1950.c +5 -5
index 7ee73f2..379fde5 100644
@@ -49,15 +49,15 @@
 #include <plat/clock.h>
 #include <plat/regs-serial.h>
 #include <plat/regs-iic.h>
-#include <plat/mci.h>
-#include <plat/udc.h>
-#include <plat/nand.h>
-#include <plat/iic.h>
+#include <linux/platform_data/mmc-s3cmci.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>
 #include <plat/irq.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 
 #include <sound/uda1380.h>
arch/arm/mach-s3c24xx/mach-rx3715.c +1 -1
index 56af354..dacbb9a 100644
@@ -43,7 +43,7 @@
 #include <mach/regs-lcd.h>
 
 #include <mach/h1940.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <mach/fb.h>
 
 #include <plat/clock.h>
arch/arm/mach-s3c24xx/mach-smdk2410.c +1 -1
index bdc27e7..82796b9 100644
@@ -47,7 +47,7 @@
 #include <asm/mach-types.h>
 
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/devs.h>
 #include <plat/cpu.h>
arch/arm/mach-s3c24xx/mach-smdk2413.c +2 -2
index b11451b..ce99fd8 100644
@@ -38,8 +38,8 @@
 #include <mach/regs-lcd.h>
 
 #include <mach/idle.h>
-#include <plat/udc.h>
-#include <plat/iic.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <mach/fb.h>
 
 #include <plat/s3c2410.h>
arch/arm/mach-s3c24xx/mach-smdk2416.c +4 -4
index c3100a0..db2787a 100644
@@ -39,17 +39,17 @@
 #include <mach/regs-s3c2443-clock.h>
 
 #include <mach/idle.h>
-#include <mach/leds-gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/leds-s3c24xx.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/s3c2416.h>
 #include <plat/gpio-cfg.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/sdhci.h>
-#include <plat/udc.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
 #include <linux/platform_data/s3c-hsudc.h>
 
 #include <plat/regs-fb-v4.h>
arch/arm/mach-s3c24xx/mach-smdk2440.c +1 -1
index 83a1036..b7ff882 100644
@@ -37,7 +37,7 @@
 
 #include <mach/idle.h>
 #include <mach/fb.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/s3c2410.h>
 #include <plat/s3c244x.h>
arch/arm/mach-s3c24xx/mach-smdk2443.c +1 -1
index 2092369..2568656 100644
@@ -37,7 +37,7 @@
 
 #include <mach/idle.h>
 #include <mach/fb.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/s3c2410.h>
 #include <plat/s3c2443.h>
arch/arm/mach-s3c24xx/mach-tct_hammer.c +1 -1
index fe99028..495bf5c 100644
@@ -45,7 +45,7 @@
 #include <asm/mach-types.h>
 
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
arch/arm/mach-s3c24xx/mach-vr1000.c +3 -3
index bd5f189..14d5b12 100644
@@ -43,13 +43,13 @@
 
 #include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/iic.h>
-#include <plat/audio-simtec.h>
+#include <linux/platform_data/i2c-s3c2410.h>
+#include <linux/platform_data/asoc-s3c24xx_simtec.h>
 
 #include "simtec.h"
 #include "common.h"
arch/arm/mach-s3c24xx/mach-vstms.c +2 -2
index 94bfaa1..f1d44ae 100644
@@ -39,8 +39,8 @@
 #include <mach/idle.h>
 #include <mach/fb.h>
 
-#include <plat/iic.h>
-#include <plat/nand.h>
+#include <linux/platform_data/i2c-s3c2410.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 
 #include <plat/s3c2410.h>
 #include <plat/s3c2412.h>
arch/arm/mach-s3c24xx/setup-i2c.c +1 -1
index 9e90a7c..7b4f333 100644
@@ -16,7 +16,7 @@
 struct platform_device;
 
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
arch/arm/mach-s3c24xx/simtec-audio.c +1 -1
index 11881c9..fd0ef05 100644
@@ -24,7 +24,7 @@
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
 
-#include <plat/audio-simtec.h>
+#include <linux/platform_data/asoc-s3c24xx_simtec.h>
 #include <plat/devs.h>
 
 #include "simtec.h"
arch/arm/mach-s3c24xx/simtec-usb.c +1 -1
index d91c1a7..17f8356 100644
@@ -34,7 +34,7 @@
 #include <mach/hardware.h>
 #include <asm/irq.h>
 
-#include <plat/usb-control.h>
+#include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <plat/devs.h>
 
 #include "simtec.h"
arch/arm/mach-s3c64xx/dev-audio.c +1 -1
index 124fd5d..35f3e07 100644
@@ -20,7 +20,7 @@
 #include <mach/dma.h>
 
 #include <plat/devs.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 #include <plat/gpio-cfg.h>
 
 static const char *rclksrc[] = {
arch/arm/mach-s3c64xx/mach-anw6410.c +1 -1
index ffa29dd..15c58df 100644
@@ -42,7 +42,7 @@
 #include <asm/mach-types.h>
 
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
 #include <plat/regs-fb-v4.h>
arch/arm/mach-s3c64xx/mach-crag6410-module.c +1 -1
index 9e382e7..181aa994 100644
@@ -24,7 +24,7 @@
 #include <sound/wm8962.h>
 #include <sound/wm9081.h>
 
-#include <plat/s3c64xx-spi.h>
+#include <linux/platform_data/spi-s3c64xx.h>
 
 #include <mach/crag6410.h>
arch/arm/mach-s3c64xx/mach-crag6410.c +2 -2
index 09cd812..717d675 100644
@@ -61,14 +61,14 @@
 #include <plat/fb.h>
 #include <plat/sdhci.h>
 #include <plat/gpio-cfg.h>
-#include <plat/s3c64xx-spi.h>
+#include <linux/platform_data/spi-s3c64xx.h>
 
 #include <plat/keypad.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/adc.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/pm.h>
 
 #include "common.h"
arch/arm/mach-s3c64xx/mach-hmt.c +2 -2
index 6890881..02222b3 100644
@@ -34,9 +34,9 @@
 #include <asm/mach-types.h>
 
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 
 #include <plat/clock.h>
 #include <plat/devs.h>
arch/arm/mach-s3c64xx/mach-mini6410.c +2 -2
index 5539a255..09311cc 100644
@@ -38,9 +38,9 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/fb.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/regs-serial.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/regs-fb-v4.h>
 
 #include <video/platform_lcd.h>
arch/arm/mach-s3c64xx/mach-ncp.c +1 -1
index cad2e05..46ee88d 100644
@@ -37,7 +37,7 @@
 #include <asm/mach-types.h>
 
 #include <plat/regs-serial.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
 
 #include <plat/clock.h>
arch/arm/mach-s3c64xx/mach-real6410.c +2 -2
index 326b216..6daca20 100644
@@ -39,9 +39,9 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/fb.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/regs-serial.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/regs-fb-v4.h>
 
 #include <video/platform_lcd.h>
arch/arm/mach-s3c64xx/mach-smartq.c +4 -4
index ceeb1de..c6d7390 100644
@@ -30,13 +30,13 @@
 #include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
-#include <plat/hwmon.h>
+#include <linux/platform_data/hwmon-s3c.h>
 #include <plat/regs-serial.h>
-#include <plat/usb-control.h>
+#include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <plat/sdhci.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 
 #include <video/platform_lcd.h>
arch/arm/mach-s3c64xx/mach-smdk6400.c +1 -1
index b0f4525..a928fae 100644
@@ -35,7 +35,7 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include "common.h"
arch/arm/mach-s3c64xx/mach-smdk6410.c +3 -3
index 0fe4f15..2547a88 100644
@@ -60,8 +60,8 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-sys.h>
 #include <mach/regs-srom.h>
-#include <plat/ata.h>
-#include <plat/iic.h>
+#include <linux/platform_data/ata-samsung_cf.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
 #include <plat/gpio-cfg.h>
 

@@ -69,7 +69,7 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/adc.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/keypad.h>
 #include <plat/backlight.h>
 #include <plat/regs-fb-v4.h>
arch/arm/mach-s3c64xx/setup-i2c0.c +1 -1
index 241af94..40666ba 100644
@@ -18,7 +18,7 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c0_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s3c64xx/setup-i2c1.c +1 -1
index 3d13a96..3fdb24c 100644
@@ -18,7 +18,7 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c1_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s3c64xx/setup-ide.c +1 -1
index 41b4256..648d8b8 100644
@@ -17,7 +17,7 @@
 #include <mach/map.h>
 #include <mach/regs-clock.h>
 #include <plat/gpio-cfg.h>
-#include <plat/ata.h>
+#include <linux/platform_data/ata-samsung_cf.h>
 
 void s3c64xx_ide_setup_gpio(void)
 {
arch/arm/mach-s5p64x0/dev-audio.c +1 -1
index 91113dd..a0d6edf 100644
@@ -13,7 +13,7 @@
 #include <linux/gpio.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include <mach/map.h>
 #include <mach/dma.h>
arch/arm/mach-s5p64x0/mach-smdk6440.c +2 -2
index 92fefad..dea78a8 100644
@@ -45,10 +45,10 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/pll.h>
 #include <plat/adc.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/s5p-time.h>
 #include <plat/backlight.h>
 #include <plat/fb.h>
arch/arm/mach-s5p64x0/mach-smdk6450.c +2 -2
index e2335ec..6f14fc7 100644
@@ -45,10 +45,10 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/pll.h>
 #include <plat/adc.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/s5p-time.h>
 #include <plat/backlight.h>
 #include <plat/fb.h>
arch/arm/mach-s5p64x0/setup-i2c0.c +1 -1
index 46b4639..a32edc5 100644
@@ -19,7 +19,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <mach/i2c.h>
arch/arm/mach-s5p64x0/setup-i2c1.c +1 -1
index 6ad3b98..ca2c5c7 100644
@@ -19,7 +19,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <plat/gpio-cfg.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 #include <mach/i2c.h>
arch/arm/mach-s5pc100/dev-audio.c +1 -1
index 9d4bde3..1cc252c 100644
@@ -13,7 +13,7 @@
 #include <linux/gpio.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include <mach/map.h>
 #include <mach/dma.h>
arch/arm/mach-s5pc100/mach-smdkc100.c +4 -4
index 0c3ae38..5d2c093 100644
@@ -44,12 +44,12 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/fb.h>
-#include <plat/iic.h>
-#include <plat/ata.h>
+#include <linux/platform_data/i2c-s3c2410.h>
+#include <linux/platform_data/ata-samsung_cf.h>
 #include <plat/adc.h>
 #include <plat/keypad.h>
-#include <plat/ts.h>
-#include <plat/audio.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
+#include <linux/platform_data/asoc-s3c.h>
 #include <plat/backlight.h>
 #include <plat/regs-fb-v4.h>
arch/arm/mach-s5pc100/setup-i2c0.c +1 -1
index eaef7a3..89a6a76 100644
@@ -18,7 +18,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c0_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s5pc100/setup-i2c1.c +1 -1
index aaff74a..faa667e 100644
@@ -18,7 +18,7 @@
 struct platform_device; /* don't need the contents */
 
 #include <linux/gpio.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c1_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s5pv210/dev-audio.c +1 -1
index 8367749..0a5480b 100644
@@ -13,7 +13,7 @@
 #include <linux/gpio.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include <mach/map.h>
 #include <mach/dma.h>
arch/arm/mach-s5pv210/mach-goni.c +1 -1
index 822a559..00f1e47 100644
@@ -43,7 +43,7 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/fb.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/keypad.h>
 #include <plat/sdhci.h>
 #include <plat/clock.h>
arch/arm/mach-s5pv210/mach-smdkc110.c +2 -2
index dfc2923..d9c99fc 100644
@@ -27,8 +27,8 @@
 #include <plat/regs-serial.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/ata.h>
-#include <plat/iic.h>
+#include <linux/platform_data/ata-samsung_cf.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/pm.h>
 #include <plat/s5p-time.h>
 #include <plat/mfc.h>
arch/arm/mach-s5pv210/mach-smdkv210.c +3 -3
index 918b23d..7d6fab4 100644
@@ -38,9 +38,9 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/adc.h>
-#include <plat/ts.h>
-#include <plat/ata.h>
-#include <plat/iic.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
+#include <linux/platform_data/ata-samsung_cf.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/keypad.h>
 #include <plat/pm.h>
 #include <plat/fb.h>
arch/arm/mach-s5pv210/mach-torbreck.c +1 -1
index 74e99bc..18785cb 100644
@@ -26,7 +26,7 @@
 #include <plat/regs-serial.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/s5p-time.h>
 
 #include "common.h"
arch/arm/mach-s5pv210/setup-i2c0.c +1 -1
index 0f1cc3a..4a15849 100644
@@ -18,7 +18,7 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c0_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s5pv210/setup-i2c1.c +1 -1
index f61365a..4777f6b 100644
@@ -18,7 +18,7 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c1_cfg_gpio(struct platform_device *dev)
arch/arm/mach-s5pv210/setup-i2c2.c +1 -1
index 2f91b5c..bbce6c7 100644
@@ -18,7 +18,7 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c2_cfg_gpio(struct platform_device *dev)
arch/arm/plat-samsung/devs.c +10 -10
index 74e31ce..07913ac 100644
@@ -46,24 +46,24 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/adc.h>
-#include <plat/ata.h>
-#include <plat/ehci.h>
+#include <linux/platform_data/ata-samsung_cf.h>
+#include <linux/platform_data/usb-ehci-s5p.h>
 #include <plat/fb.h>
 #include <plat/fb-s3c2410.h>
-#include <plat/hwmon.h>
-#include <plat/iic.h>
+#include <linux/platform_data/hwmon-s3c.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/keypad.h>
-#include <plat/mci.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mmc-s3cmci.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/sdhci.h>
-#include <plat/ts.h>
-#include <plat/udc.h>
-#include <plat/usb-control.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
+#include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <plat/usb-phy.h>
 #include <plat/regs-iic.h>
 #include <plat/regs-serial.h>
 #include <plat/regs-spi.h>
-#include <plat/s3c64xx-spi.h>
+#include <linux/platform_data/spi-s3c64xx.h>
 
 static u64 samsung_device_dma_mask = DMA_BIT_MASK(32);
drivers/ata/pata_samsung_cf.c +1 -1
index 1b372c2..63ffb00 100644
@@ -23,7 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
-#include <plat/ata.h>
+#include <linux/platform_data/ata-samsung_cf.h>
 #include <plat/regs-ata.h>
 
 #define DRV_NAME "pata_samsung_cf"
drivers/hwmon/s3c-hwmon.c +1 -1
index b7975f8..fe11b95 100644
@@ -34,7 +34,7 @@
 #include <linux/hwmon-sysfs.h>
 
 #include <plat/adc.h>
-#include <plat/hwmon.h>
+#include <linux/platform_data/hwmon-s3c.h>
 
 struct s3c_hwmon_attr {
 	struct sensor_device_attribute	in;
drivers/i2c/busses/i2c-s3c2410.c +1 -1
index 5ae3b02..4d07dea 100644
@@ -42,7 +42,7 @@
 #include <asm/irq.h>
 
 #include <plat/regs-iic.h>
-#include <plat/iic.h>
+#include <linux/platform_data/i2c-s3c2410.h>
 
 /* Treat S3C2410 as baseline hardware, anything else is supported via

quirks */
#define QUIRK_S3C2440 (1 << 0)

drivers/input/touchscreen/s3c2410_ts.c +1 -1
index bf1a064..df9e816 100644
@@ -37,7 +37,7 @@
 
 #include <plat/adc.h>
 #include <plat/regs-adc.h>
-#include <plat/ts.h>
+#include <linux/platform_data/touchscreen-s3c2410.h>
 
 #define TSC_SLEEP  (S3C2410_ADCTSC_PULL_UP_DISABLE |
 S3C2410_ADCTSC_XY_PST(0))
drivers/leds/leds-s3c24xx.c +1 -1
index 942f0ea..e1a0df6 100644
@@ -21,7 +21,7 @@
 
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
-#include <mach/leds-gpio.h>
+#include <linux/platform_data/leds-s3c24xx.h>
 
 /* our context */
drivers/media/video/s5p-fimc/mipi-csis.c +1 -1
index 2f73d9e..5e89843 100644
@@ -26,7 +26,7 @@
 #include <linux/spinlock.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-subdev.h>
-#include <plat/mipi_csis.h>
+#include <linux/platform_data/mipi-csis.h>
 #include "mipi-csis.h"
 
 static int debug;
drivers/mmc/host/s3cmci.c +1 -1
index bd5a5cc..4638dda 100644
@@ -27,7 +27,7 @@
 
 #include <mach/regs-sdi.h>
 
-#include <plat/mci.h>
+#include <linux/platform_data/mmc-s3cmci.h>
 
 #include "s3cmci.h"
drivers/mtd/nand/s3c2410.c +1 -1
index 91121f3..d804061 100644
@@ -46,7 +46,7 @@
 #include <asm/io.h>
 
 #include <plat/regs-nand.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-s3c2410.h>
 
 #ifdef CONFIG_MTD_NAND_S3C2410_HWECC
 static int hardware_ecc = 1;
drivers/spi/spi-s3c64xx.c +1 -1
index d1c8441f..0e2a022 100644
@@ -32,7 +32,7 @@
 #include <linux/of_gpio.h>
 
 #include <mach/dma.h>
-#include <plat/s3c64xx-spi.h>
+#include <linux/platform_data/spi-s3c64xx.h>
 
 #define MAX_SPI_PORTS		3
drivers/usb/gadget/s3c2410_udc.c +1 -1
index f2e51f5..f006045 100644
@@ -43,7 +43,7 @@
 #include <mach/hardware.h>
 
 #include <plat/regs-udc.h>
-#include <plat/udc.h>
+#include <linux/platform_data/usb-s3c2410_udc.h>
 
 
 #include "s3c2410_udc.h"
drivers/usb/host/ehci-s5p.c +1 -1
index 9d8f1dd..dfb14c7 100644
@@ -16,7 +16,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/of_gpio.h>
-#include <plat/ehci.h>
+#include <linux/platform_data/usb-ehci-s5p.h>
 #include <plat/usb-phy.h>
 
 #define EHCI_INSNREG00(base)			(base + 0x90)
drivers/usb/host/ohci-exynos.c +1 -1
index fc3091b..20a5008 100644
@@ -14,7 +14,7 @@
 #include <linux/clk.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/usb-exynos.h>
 #include <plat/usb-phy.h>
 
 struct exynos_ohci_hcd {
drivers/usb/host/ohci-s3c2410.c +1 -1
index 664c869..0d2309c 100644
@@ -21,7 +21,7 @@
 
 #include <linux/platform_device.h>
 #include <linux/clk.h>
-#include <plat/usb-control.h>
+#include <linux/platform_data/usb-ohci-s3c2410.h>
 
 #define valid_port(idx) ((idx) == 1 || (idx) == 2)
include/linux/platform_data/asoc-s3c.h renamed from arch/arm/plat-samsung/include/plat/audio.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/audio.h
rename to include/linux/platform_data/asoc-s3c.h
include/linux/platform_data/asoc-s3c24xx_simtec.h renamed from arch/arm/plat-samsung/include/plat/audio-simtec.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/audio-simtec.h
rename to include/linux/platform_data/asoc-s3c24xx_simtec.h
include/linux/platform_data/ata-samsung_cf.h renamed from arch/arm/plat-samsung/include/plat/ata.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/ata.h
rename to include/linux/platform_data/ata-samsung_cf.h
include/linux/platform_data/hwmon-s3c.h renamed from arch/arm/plat-samsung/include/plat/hwmon.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/hwmon.h
rename to include/linux/platform_data/hwmon-s3c.h
include/linux/platform_data/i2c-s3c2410.h renamed from arch/arm/plat-samsung/include/plat/iic.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/iic.h
rename to include/linux/platform_data/i2c-s3c2410.h
include/linux/platform_data/leds-s3c24xx.h renamed from arch/arm/mach-s3c24xx/include/mach/leds-gpio.h +0 -0
similarity index 100%
rename from arch/arm/mach-s3c24xx/include/mach/leds-gpio.h
rename to include/linux/platform_data/leds-s3c24xx.h
include/linux/platform_data/mipi-csis.h renamed from arch/arm/plat-samsung/include/plat/mipi_csis.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/mipi_csis.h
rename to include/linux/platform_data/mipi-csis.h
include/linux/platform_data/mmc-s3cmci.h renamed from arch/arm/plat-samsung/include/plat/mci.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/mci.h
rename to include/linux/platform_data/mmc-s3cmci.h
include/linux/platform_data/mtd-nand-s3c2410.h renamed from arch/arm/plat-samsung/include/plat/nand.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/nand.h
rename to include/linux/platform_data/mtd-nand-s3c2410.h
include/linux/platform_data/spi-s3c64xx.h renamed from arch/arm/plat-samsung/include/plat/s3c64xx-spi.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/s3c64xx-spi.h
rename to include/linux/platform_data/spi-s3c64xx.h
include/linux/platform_data/touchscreen-s3c2410.h renamed from arch/arm/plat-samsung/include/plat/ts.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/ts.h
rename to include/linux/platform_data/touchscreen-s3c2410.h
include/linux/platform_data/usb-ehci-s5p.h renamed from arch/arm/plat-samsung/include/plat/ehci.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/ehci.h
rename to include/linux/platform_data/usb-ehci-s5p.h
include/linux/platform_data/usb-exynos.h renamed from arch/arm/mach-exynos/include/mach/ohci.h +0 -0
similarity index 100%
rename from arch/arm/mach-exynos/include/mach/ohci.h
rename to include/linux/platform_data/usb-exynos.h
include/linux/platform_data/usb-ohci-s3c2410.h renamed from arch/arm/plat-samsung/include/plat/usb-control.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/usb-control.h
rename to include/linux/platform_data/usb-ohci-s3c2410.h
include/linux/platform_data/usb-s3c2410_udc.h renamed from arch/arm/plat-samsung/include/plat/udc.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/udc.h
rename to include/linux/platform_data/usb-s3c2410_udc.h
sound/soc/samsung/ac97.c +1 -1
index 3d04c1f..14fbcd3 100644
@@ -21,7 +21,7 @@
 
 #include <mach/dma.h>
 #include <plat/regs-ac97.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include "dma.h"
sound/soc/samsung/i2s.c +1 -1
index 6ac7b82..40b00a1 100644
@@ -20,7 +20,7 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 
 #include "dma.h"
 #include "idma.h"
sound/soc/samsung/pcm.c +1 -1
index 89b0646..c860819 100644
@@ -19,7 +19,7 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 #include <mach/dma.h>
 
 #include "dma.h"
sound/soc/samsung/s3c24xx_simtec.c +1 -1
index 656d5af..335a7d8 100644
@@ -13,7 +13,7 @@
 
 #include <sound/soc.h>
 
-#include <plat/audio-simtec.h>
+#include <linux/platform_data/asoc-s3c24xx_simtec.h>
 
 #include "s3c24xx-i2s.h"
 #include "s3c24xx_simtec.h"
sound/soc/samsung/spdif.c +1 -2
index a5a56a1..bc24c7a 100644
@@ -17,7 +17,7 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-s3c.h>
 #include <mach/dma.h>
 
 #include "dma.h"
--

1.7.10

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

author
#75 lore raw

PATCH 16/16 ARM: spear: move platform_data definitions

In reply to Arnd Bergmann

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 spear include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Viresh Kumar <[email protected]>
Cc Shiraz Hashim <[email protected]>
Cc spear-devel at list.st.com
Cc Dmitry Torokhov <[email protected]>
---
 drivers/input/keyboard/spear-keyboard.c                              |    2 +-
 .../plat/keyboard.h => include/linux/platform_data/keyboard-spear.h  |    0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/arm/plat-spear/include/plat/keyboard.h => include/linux/platform_data/keyboard-spear.h (100%)
drivers/input/keyboard/spear-keyboard.c +1 -1
index 72ef01b..c7ca97f 100644
@@ -24,7 +24,7 @@
 #include <linux/pm_wakeup.h>
 #include <linux/slab.h>
 #include <linux/types.h>
-#include <plat/keyboard.h>
+#include <linux/platform_data/keyboard-spear.h>
 
 /* Keyboard Registers */
 #define MODE_CTL_REG	0x00
include/linux/platform_data/keyboard-spear.h renamed from arch/arm/plat-spear/include/plat/keyboard.h +0 -0
similarity index 100%
rename from arch/arm/plat-spear/include/plat/keyboard.h
rename to include/linux/platform_data/keyboard-spear.h
Signature · 1 line
1.7.10
Acked-by on v1 16/16
#76 lore raw

Re: [PATCH 16/16] ARM: spear: move platform_data definitions

Quoted 4 lines · Arnd Bergmann

Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories.

Quoted 8 lines

This moves such data out of the spear include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Viresh Kumar <[email protected]>
Cc Shiraz Hashim <[email protected]>
Cc spear-devel at list.st.com
Cc Dmitry Torokhov <[email protected]>
Acked-by Viresh Kumar <[email protected]>
#77 lore raw

Re: [PATCH 13/16] ARM: omap: move platform_data definitions

In reply to Arnd Bergmann

Arnd,

Quoted 7 lines · Arnd Bergmann

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 omap include directories

Signed-off-by Arnd Bergmann <[email protected]>

[...]

Quoted 11 lines
 81 files changed, 87 insertions(+), 87 deletions(-)
 rename arch/arm/plat-omap/include/plat/mcbsp.h => include/linux/platform_data/dsp-mcbsp.h (100%)
 rename arch/arm/plat-omap/include/plat/dsp.h => include/linux/platform_data/dsp-omap.h (100%)
 rename arch/arm/plat-omap/include/plat/keypad.h => include/linux/platform_data/keypad-omap.h (100%)
 rename arch/arm/plat-omap/include/plat/lcd_mipid.h => include/linux/platform_data/lcd-mipid.h (100%)
 rename arch/arm/plat-omap/include/plat/nand.h => include/linux/platform_data/mtd-nand-omap2.h (100%)
 rename arch/arm/plat-omap/include/plat/onenand.h => include/linux/platform_data/mtd-onenand-omap2.h (100%)
 rename arch/arm/plat-omap/include/plat/remoteproc.h => include/linux/platform_data/remoteproc-omap.h (100%)
 rename arch/arm/plat-omap/include/plat/voltage.h => include/linux/platform_data/smartreflex-omap.h (100%)
 rename arch/arm/plat-omap/include/plat/mcspi.h => include/linux/platform_data/spi-omap2-mcspi.h (100%)

Just curious to know how you came with some of the above header names ?

plat/mcbsp ---> dsp-mcbsp.h
There is no connection of DSP with McBSP. "omap-mcbsp.h" would been a better name.

plat/nand.h --> /mtd-nand-omap2.h
plat/onenand.h --> /mtd-onenand-omap2.h
May be "omap-nand.h" and "omap-onenand.h"

plat/mcspi.h-->spi-omap2-mcspi.h
May be "omap-spi.h"

Regards,
Santosh

author
#78 lore raw

Re: [PATCH 13/16] ARM: omap: move platform_data definitions

Quoted 5 lines · Santosh

Just curious to know how you came with some of the above header names ?

plat/mcbsp ---> dsp-mcbsp.h
There is no connection of DSP with McBSP. "omap-mcbsp.h" would been a better name.

This one was a mistake on my side, as Tony and Peter already pointed out. How about asoc-mcbsp.h or asoc-omap-mcbsp.h?

Quoted 7 lines

plat/nand.h --> /mtd-nand-omap2.h
plat/onenand.h --> /mtd-onenand-omap2.h
May be "omap-nand.h" and "omap-onenand.h"

plat/mcspi.h-->spi-omap2-mcspi.h
May be "omap-spi.h"

As I wrote in the introductory mail, I tried to always prefix the file names with the subsystem, followed by the name of the driver, in order to standardize on just one set of rules.

The drivers implementing the three headers above are:

drivers/mtd/nand/omap2.c
drivers/mtd/onenand/omap2.c
drivers/spi/spi-omap2-mcspi.c

so these all seem appropriate.

Arnd

#79 lore raw

Re: [PATCH 13/16] ARM: omap: move platform_data definitions

Quoted 10 lines · Arnd Bergmann
Quoted 5 lines · Santosh

Just curious to know how you came with some of the above header names ?

plat/mcbsp ---> dsp-mcbsp.h
There is no connection of DSP with McBSP. "omap-mcbsp.h" would been a better name.

This one was a mistake on my side, as Tony and Peter already pointed out. How about asoc-mcbsp.h or asoc-omap-mcbsp.h?

After re-reading the cover-letter and your below response, 'asoc-omap-mcbsp.h' seems to be fine.

Quoted 4 lines
Quoted 4 lines

plat/nand.h --> /mtd-nand-omap2.h
plat/onenand.h --> /mtd-onenand-omap2.h
May be "omap-nand.h" and "omap-onenand.h"

Quoted 8 lines
Quoted 3 lines

plat/mcspi.h-->spi-omap2-mcspi.h
May be "omap-spi.h"

As I wrote in the introductory mail, I tried to always prefix the file names with the subsystem, followed by the name of the driver, in order to standardize on just one set of rules.

Just read that now.

Quoted 8 lines

The drivers implementing the three headers above are:

drivers/mtd/nand/omap2.c
drivers/mtd/onenand/omap2.c
drivers/spi/spi-omap2-mcspi.c

so these all seem appropriate.

Sorry I missed the subsystem prefix point.
These names seems to be fine then.

Regards
Santosh

#80 lore raw

Re: [PATCH 13/16] ARM: omap: move platform_data definitions

Quoted 8 lines · Santosh
Quoted 7 lines · Arnd Bergmann
Quoted 5 lines · Santosh

Just curious to know how you came with some of the above header names ?

plat/mcbsp ---> dsp-mcbsp.h
There is no connection of DSP with McBSP. "omap-mcbsp.h" would been a better name.

Quoted 6 lines
Quoted 3 lines

This one was a mistake on my side, as Tony and Peter already pointed out. How about asoc-mcbsp.h or asoc-omap-mcbsp.h?

After re-reading the cover-letter and your below response, 'asoc-omap-mcbsp.h' seems to be fine.

Note that mcbsp is also applicable to Davinci family of devices.

Thanks,
Vaibhav

Quoted 33 lines
Quoted 4 lines
Quoted 4 lines

plat/nand.h --> /mtd-nand-omap2.h
plat/onenand.h --> /mtd-onenand-omap2.h
May be "omap-nand.h" and "omap-onenand.h"

Quoted 8 lines
Quoted 3 lines

plat/mcspi.h-->spi-omap2-mcspi.h
May be "omap-spi.h"

As I wrote in the introductory mail, I tried to always prefix the file names with the subsystem, followed by the name of the driver, in order to standardize on just one set of rules.

Just read that now.

Quoted 8 lines

The drivers implementing the three headers above are:

drivers/mtd/nand/omap2.c
drivers/mtd/onenand/omap2.c
drivers/spi/spi-omap2-mcspi.c

so these all seem appropriate.

Sorry I missed the subsystem prefix point.
These names seems to be fine then.

Regards
Santosh

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

author
#81 lore raw

Re: [PATCH 13/16] ARM: omap: move platform_data definitions

Quoted 9 lines · Vaibhav Hiremath
Quoted 8 lines · Santosh
Quoted 7 lines · Arnd Bergmann
Quoted 5 lines · Santosh

Just curious to know how you came with some of the above header names ?

plat/mcbsp ---> dsp-mcbsp.h
There is no connection of DSP with McBSP. "omap-mcbsp.h" would been a better name.

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

This one was a mistake on my side, as Tony and Peter already pointed out. How about asoc-mcbsp.h or asoc-omap-mcbsp.h?

After re-reading the cover-letter and your below response, 'asoc-omap-mcbsp.h' seems to be fine.

Note that mcbsp is also applicable to Davinci family of devices.

asoc-ti-mcbsp.h then?

Arnd

maintainer Acked-by
#82 lore raw

Re: [PATCH 13/16] ARM: omap: move platform_data definitions

Quoted 13 lines · Arnd Bergmann
Quoted 12 lines · Vaibhav Hiremath
Quoted 11 lines · Santosh
Quoted 10 lines · Arnd Bergmann
Quoted 5 lines · Santosh

Just curious to know how you came with some of the above header names ?

plat/mcbsp ---> dsp-mcbsp.h
There is no connection of DSP with McBSP. "omap-mcbsp.h" would been a better name.

This one was a mistake on my side, as Tony and Peter already pointed out. How about asoc-mcbsp.h or asoc-omap-mcbsp.h?

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

After re-reading the cover-letter and your below response, 'asoc-omap-mcbsp.h' seems to be fine.

Note that mcbsp is also applicable to Davinci family of devices.

asoc-ti-mcbsp.h then?

Sounds good to me. Whatever the name ends up being:

Acked-by Tony Lindgren <[email protected]>
#83 lore raw

PATCH 13/16 ARM: omap: move platform_data definitions

In reply to Arnd Bergmann
Quoted 13 lines · Arnd Bergmann
Quoted 12 lines · Vaibhav Hiremath
Quoted 11 lines · Santosh
Quoted 10 lines · Arnd Bergmann
Quoted 5 lines · Santosh

Just curious to know how you came with some of the above header names ?

plat/mcbsp ---> dsp-mcbsp.h
There is no connection of DSP with McBSP. "omap-mcbsp.h" would been a better name.

This one was a mistake on my side, as Tony and Peter already pointed out. How about asoc-mcbsp.h or asoc-omap-mcbsp.h?

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

After re-reading the cover-letter and your below response, 'asoc-omap-mcbsp.h' seems to be fine.

Note that mcbsp is also applicable to Davinci family of devices.

asoc-ti-mcbsp.h then?

Looks ok to me.

Thanks,
Vaibhav

Quoted 2 lines

Arnd

#84 lore raw

PATCH 13/16 ARM: omap: move platform_data definitions

In reply to Arnd Bergmann
Quoted 13 lines · Arnd Bergmann
Quoted 12 lines · Vaibhav Hiremath
Quoted 11 lines · Santosh
Quoted 10 lines · Arnd Bergmann
Quoted 5 lines · Santosh

Just curious to know how you came with some of the above header names ?

plat/mcbsp ---> dsp-mcbsp.h
There is no connection of DSP with McBSP. "omap-mcbsp.h" would been a better name.

This one was a mistake on my side, as Tony and Peter already pointed out. How about asoc-mcbsp.h or asoc-omap-mcbsp.h?

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

After re-reading the cover-letter and your below response, 'asoc-omap-mcbsp.h' seems to be fine.

Note that mcbsp is also applicable to Davinci family of devices.

asoc-ti-mcbsp.h then?

DaVinci has a McBSP, but it is not the same as OMAP McBSP. The driver is different (sound/soc/davinci/davinci-i2s.c vs sound/soc/omap/mcbsp.c) and there as IP differences as well. It is better to keep the name as asoc-omap-mcbsp.h for clarity.

Thanks,
Sekhar