Patchwork [13/16] ARM: omap: move platform_data definitions

login
register
mail settings
Submitter Arnd Bergmann
Date Sept. 11, 2012, 1:02 p.m.
Message ID <1347368559-31329-1-git-send-email-arnd@arndb.de>
Download mbox | patch
Permalink /patch/183114/
State New
Headers show

Comments

Arnd Bergmann - Sept. 11, 2012, 1:02 p.m.
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 <arnd@arndb.de>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: "BenoƮt Cousson" <b-cousson@ti.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Ohad Ben-Cohen <ohad@wizery.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Omar Ramirez Luna <omar.ramirez@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Jarkko Nikula <jarkko.nikula@bitmer.com>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: Jean Pihet <j-pihet@ti.com>
Cc: J Keerthy <j-keerthy@ti.com>
Cc: linux-omap@vger.kernel.org
---
 arch/arm/mach-omap1/board-ams-delta.c                              |    2 +-
 arch/arm/mach-omap1/board-fsample.c                                |    2 +-
 arch/arm/mach-omap1/board-h2.c                                     |    2 +-
 arch/arm/mach-omap1/board-h3.c                                     |    2 +-
 arch/arm/mach-omap1/board-htcherald.c                              |    2 +-
 arch/arm/mach-omap1/board-innovator.c                              |    2 +-
 arch/arm/mach-omap1/board-nokia770.c                               |    4 ++--
 arch/arm/mach-omap1/board-osk.c                                    |    2 +-
 arch/arm/mach-omap1/board-palmte.c                                 |    2 +-
 arch/arm/mach-omap1/board-palmtt.c                                 |    2 +-
 arch/arm/mach-omap1/board-palmz71.c                                |    2 +-
 arch/arm/mach-omap1/board-perseus2.c                               |    2 +-
 arch/arm/mach-omap1/board-sx1.c                                    |    2 +-
 arch/arm/mach-omap1/mcbsp.c                                        |    2 +-
 arch/arm/mach-omap2/board-3430sdp.c                                |    2 +-
 arch/arm/mach-omap2/board-cm-t35.c                                 |    4 ++--
 arch/arm/mach-omap2/board-cm-t3517.c                               |    2 +-
 arch/arm/mach-omap2/board-devkit8000.c                             |    4 ++--
 arch/arm/mach-omap2/board-flash.c                                  |    4 ++--
 arch/arm/mach-omap2/board-igep0020.c                               |    2 +-
 arch/arm/mach-omap2/board-ldp.c                                    |    2 +-
 arch/arm/mach-omap2/board-n8x0.c                                   |    4 ++--
 arch/arm/mach-omap2/board-omap3beagle.c                            |    2 +-
 arch/arm/mach-omap2/board-omap3evm.c                               |    4 ++--
 arch/arm/mach-omap2/board-omap3pandora.c                           |    4 ++--
 arch/arm/mach-omap2/board-omap3stalker.c                           |    4 ++--
 arch/arm/mach-omap2/board-omap3touchbook.c                         |    4 ++--
 arch/arm/mach-omap2/board-overo.c                                  |    4 ++--
 arch/arm/mach-omap2/board-rm680.c                                  |    2 +-
 arch/arm/mach-omap2/board-rx51-peripherals.c                       |    4 ++--
 arch/arm/mach-omap2/board-rx51-video.c                             |    2 +-
 arch/arm/mach-omap2/board-rx51.c                                   |    2 +-
 arch/arm/mach-omap2/board-zoom-display.c                           |    2 +-
 arch/arm/mach-omap2/common-board-devices.c                         |    4 ++--
 arch/arm/mach-omap2/devices.c                                      |    2 +-
 arch/arm/mach-omap2/dsp.c                                          |    2 +-
 arch/arm/mach-omap2/gpmc-nand.c                                    |    2 +-
 arch/arm/mach-omap2/gpmc-onenand.c                                 |    2 +-
 arch/arm/mach-omap2/mcbsp.c                                        |    2 +-
 arch/arm/mach-omap2/omap_hwmod_2420_data.c                         |    2 +-
 arch/arm/mach-omap2/omap_hwmod_2430_data.c                         |    4 ++--
 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c                 |    2 +-
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c                         |    4 ++--
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c                         |    4 ++--
 arch/arm/mach-omap2/voltage.h                                      |    2 +-
 arch/arm/plat-omap/common.c                                        |    2 +-
 drivers/input/keyboard/omap-keypad.c                               |    2 +-
 drivers/mtd/nand/omap2.c                                           |    2 +-
 drivers/mtd/onenand/omap2.c                                        |    2 +-
 drivers/remoteproc/omap_remoteproc.c                               |    2 +-
 drivers/spi/spi-omap2-mcspi.c                                      |    2 +-
 drivers/staging/tidspbridge/core/dsp-clock.c                       |    2 +-
 drivers/staging/tidspbridge/core/tiomap3430.c                      |    2 +-
 drivers/staging/tidspbridge/core/tiomap3430_pwr.c                  |    2 +-
 drivers/staging/tidspbridge/core/tiomap_io.c                       |    2 +-
 drivers/staging/tidspbridge/rmgr/drv_interface.c                   |    2 +-
 drivers/video/omap/lcd_mipid.c                                     |    2 +-
 .../plat/mcbsp.h => include/linux/platform_data/dsp-mcbsp.h        |    0
 .../include/plat/dsp.h => include/linux/platform_data/dsp-omap.h   |    0
 .../plat/keypad.h => include/linux/platform_data/keypad-omap.h     |    0
 .../plat/lcd_mipid.h => include/linux/platform_data/lcd-mipid.h    |    0
 .../plat/nand.h => include/linux/platform_data/mtd-nand-omap2.h    |    0
 .../onenand.h => include/linux/platform_data/mtd-onenand-omap2.h   |    0
 .../remoteproc.h => include/linux/platform_data/remoteproc-omap.h  |    0
 .../voltage.h => include/linux/platform_data/smartreflex-omap.h    |    0
 .../plat/mcspi.h => include/linux/platform_data/spi-omap2-mcspi.h  |    0
 include/linux/power/smartreflex.h                                  |    2 +-
 sound/soc/omap/am3517evm.c                                         |    2 +-
 sound/soc/omap/ams-delta.c                                         |    2 +-
 sound/soc/omap/igep0020.c                                          |    2 +-
 sound/soc/omap/mcbsp.c                                             |    2 +-
 sound/soc/omap/n810.c                                              |    2 +-
 sound/soc/omap/omap-mcbsp.c                                        |    2 +-
 sound/soc/omap/omap3beagle.c                                       |    2 +-
 sound/soc/omap/omap3evm.c                                          |    2 +-
 sound/soc/omap/omap3pandora.c                                      |    2 +-
 sound/soc/omap/osk5912.c                                           |    2 +-
 sound/soc/omap/overo.c                                             |    2 +-
 sound/soc/omap/rx51.c                                              |    2 +-
 sound/soc/omap/sdp3430.c                                           |    2 +-
 sound/soc/omap/zoom2.c                                             |    2 +-
 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%)
Santosh Shilimkar - Sept. 11, 2012, 2:06 p.m.
Arnd,

On Tue, Sep 11, 2012 at 6:32 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> 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 <arnd@arndb.de>

[...]

>  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
Arnd Bergmann - Sept. 11, 2012, 2:17 p.m.
On Tuesday 11 September 2012, Shilimkar, Santosh wrote:
> 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?

> 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
Santosh Shilimkar - Sept. 11, 2012, 2:24 p.m.
On Tue, Sep 11, 2012 at 7:47 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Tuesday 11 September 2012, Shilimkar, Santosh wrote:
>> 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.

>> 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.
>
Just read that now.

> 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
hvaibhav@ti.com - Sept. 11, 2012, 4:09 p.m.
On 9/11/2012 7:54 PM, Shilimkar, Santosh wrote:
> On Tue, Sep 11, 2012 at 7:47 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>> On Tuesday 11 September 2012, Shilimkar, Santosh wrote:
>>> 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.
> 

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

Thanks,
Vaibhav

>>> 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.
>>
> Just read that now.
> 
>> 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@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
Arnd Bergmann - Sept. 11, 2012, 5:04 p.m.
On Tuesday 11 September 2012, Vaibhav Hiremath wrote:
> On 9/11/2012 7:54 PM, Shilimkar, Santosh wrote:
> > On Tue, Sep 11, 2012 at 7:47 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> >> On Tuesday 11 September 2012, Shilimkar, Santosh wrote:
> >>> 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.
> > 
> 
> Note that mcbsp is also applicable to Davinci family of devices.

asoc-ti-mcbsp.h then?

	Arnd
Jeff Garzik - Sept. 11, 2012, 5:12 p.m.
On 09/11/2012 09:02 AM, Arnd Bergmann wrote:
> Platform data for device drivers should be defined in
> include/linux/platform_data/*.h, not in the architecture
> and platform specific directories.
>
> This moves such data out of the samsung include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Kukjin Kim <kgene.kim@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Ben Dooks <ben-linux@fluff.org>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Jeff Garzik <jgarzik@pobox.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: Bryan Wu <bryan.wu@canonical.com>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Felipe Balbi <balbi@ti.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Cc: Sangbeom Kim <sbkim73@samsung.com>
> Cc: Liam Girdwood <lrg@ti.com>
> Cc: linux-samsung-soc@vger.kernel.org
> ---
>   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 +-

Acked-by: Jeff Garzik <jgarzik@redhat.com>
Tony Lindgren - Sept. 11, 2012, 5:36 p.m.
* Arnd Bergmann <arnd@arndb.de> [120911 10:05]:
> On Tuesday 11 September 2012, Vaibhav Hiremath wrote:
> > On 9/11/2012 7:54 PM, Shilimkar, Santosh wrote:
> > > On Tue, Sep 11, 2012 at 7:47 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> > >> On Tuesday 11 September 2012, Shilimkar, Santosh wrote:
> > >>> 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.
> > > 
> > 
> > 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 <tony@atomide.com>
Jingoo Han - Sept. 12, 2012, 1:27 a.m.
On Tuesday, September 11, 2012 10:03 PM Arnd Bergmann wrote
> 
> Platform data for device drivers should be defined in
> include/linux/platform_data/*.h, not in the architecture
> and platform specific directories.
> 
> This moves such data out of the samsung include directories
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Kukjin Kim <kgene.kim@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Ben Dooks <ben-linux@fluff.org>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Jeff Garzik <jgarzik@pobox.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: Bryan Wu <bryan.wu@canonical.com>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Felipe Balbi <balbi@ti.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Cc: Sangbeom Kim <sbkim73@samsung.com>
> Cc: Liam Girdwood <lrg@ti.com>
> Cc: linux-samsung-soc@vger.kernel.org
> ---
>  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%)

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


>  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%)
>
viresh kumar - Sept. 12, 2012, 3:17 a.m.
On Tue, Sep 11, 2012 at 6:32 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> 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 <arnd@arndb.de>
>
> Cc: Viresh Kumar <viresh.linux@gmail.com>
> Cc: Shiraz Hashim <shiraz.hashim@st.com>
> Cc: spear-devel@list.st.com
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
hvaibhav@ti.com - Sept. 12, 2012, 3:53 a.m.
On Tue, Sep 11, 2012 at 22:34:16, Arnd Bergmann wrote:
> On Tuesday 11 September 2012, Vaibhav Hiremath wrote:
> > On 9/11/2012 7:54 PM, Shilimkar, Santosh wrote:
> > > On Tue, Sep 11, 2012 at 7:47 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> > >> On Tuesday 11 September 2012, Shilimkar, Santosh wrote:
> > >>> 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.
> > > 
> > 
> > Note that mcbsp is also applicable to Davinci family of devices.
> 
> asoc-ti-mcbsp.h then?
> 

Looks ok to me.

Thanks,
Vaibhav

> 	Arnd
>
Kyungmin Park - Sept. 12, 2012, 5:44 a.m.
On 9/11/12, Arnd Bergmann <arnd@arndb.de> wrote:
> Platform data for device drivers should be defined in
> include/linux/platform_data/*.h, not in the architecture
> and platform specific directories.
>
> This moves such data out of the samsung include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Kukjin Kim <kgene.kim@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Ben Dooks <ben-linux@fluff.org>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Jeff Garzik <jgarzik@pobox.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: Bryan Wu <bryan.wu@canonical.com>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Felipe Balbi <balbi@ti.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Cc: Sangbeom Kim <sbkim73@samsung.com>
> Cc: Liam Girdwood <lrg@ti.com>
> Cc: linux-samsung-soc@vger.kernel.org
> ---
>  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%)
>
> diff --git a/arch/arm/mach-exynos/dev-audio.c
> b/arch/arm/mach-exynos/dev-audio.c
> index b33a5b6..ae321c7 100644
> --- a/arch/arm/mach-exynos/dev-audio.c
> +++ b/arch/arm/mach-exynos/dev-audio.c
> @@ -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>
> diff --git a/arch/arm/mach-exynos/dev-ohci.c
> b/arch/arm/mach-exynos/dev-ohci.c
> index b8e7530..14ed795 100644
> --- a/arch/arm/mach-exynos/dev-ohci.c
> +++ b/arch/arm/mach-exynos/dev-ohci.c
> @@ -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>
> diff --git a/arch/arm/mach-exynos/mach-nuri.c
> b/arch/arm/mach-exynos/mach-nuri.c
> index ea785fc..393d2ce 100644
> --- a/arch/arm/mach-exynos/mach-nuri.c
> +++ b/arch/arm/mach-exynos/mach-nuri.c
> @@ -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>
>
> diff --git a/arch/arm/mach-exynos/mach-origen.c
> b/arch/arm/mach-exynos/mach-origen.c
> index 5ca8030..4a531dc 100644
> --- a/arch/arm/mach-exynos/mach-origen.c
> +++ b/arch/arm/mach-exynos/mach-origen.c
> @@ -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>
> diff --git a/arch/arm/mach-exynos/mach-smdk4x12.c
> b/arch/arm/mach-exynos/mach-smdk4x12.c
> index b26beb1..6a791fd 100644
> --- a/arch/arm/mach-exynos/mach-smdk4x12.c
> +++ b/arch/arm/mach-exynos/mach-smdk4x12.c
> @@ -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>
> diff --git a/arch/arm/mach-exynos/mach-smdkv310.c
> b/arch/arm/mach-exynos/mach-smdkv310.c
> index 3cfa688..fa2ada6 100644
> --- a/arch/arm/mach-exynos/mach-smdkv310.c
> +++ b/arch/arm/mach-exynos/mach-smdkv310.c
> @@ -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"
> diff --git a/arch/arm/mach-exynos/mach-universal_c210.c
> b/arch/arm/mach-exynos/mach-universal_c210.c
> index 4d1f40d..bc49e5a 100644
> --- a/arch/arm/mach-exynos/mach-universal_c210.c
> +++ b/arch/arm/mach-exynos/mach-universal_c210.c
> @@ -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>
>
> diff --git a/arch/arm/mach-exynos/setup-i2c0.c
> b/arch/arm/mach-exynos/setup-i2c0.c
> index b90d94c..5700f23 100644
> --- a/arch/arm/mach-exynos/setup-i2c0.c
> +++ b/arch/arm/mach-exynos/setup-i2c0.c
> @@ -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>
>
> diff --git a/arch/arm/mach-exynos/setup-i2c1.c
> b/arch/arm/mach-exynos/setup-i2c1.c
> index fd7235a..8d2279c 100644
> --- a/arch/arm/mach-exynos/setup-i2c1.c
> +++ b/arch/arm/mach-exynos/setup-i2c1.c
> @@ -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)
> diff --git a/arch/arm/mach-exynos/setup-i2c2.c
> b/arch/arm/mach-exynos/setup-i2c2.c
> index 2694b19..0ed62fc 100644
> --- a/arch/arm/mach-exynos/setup-i2c2.c
> +++ b/arch/arm/mach-exynos/setup-i2c2.c
> @@ -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)
> diff --git a/arch/arm/mach-exynos/setup-i2c3.c
> b/arch/arm/mach-exynos/setup-i2c3.c
> index 379bd30..7787fd2 100644
> --- a/arch/arm/mach-exynos/setup-i2c3.c
> +++ b/arch/arm/mach-exynos/setup-i2c3.c
> @@ -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)
> diff --git a/arch/arm/mach-exynos/setup-i2c4.c
> b/arch/arm/mach-exynos/setup-i2c4.c
> index 9f3c048..edc847f 100644
> --- a/arch/arm/mach-exynos/setup-i2c4.c
> +++ b/arch/arm/mach-exynos/setup-i2c4.c
> @@ -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)
> diff --git a/arch/arm/mach-exynos/setup-i2c5.c
> b/arch/arm/mach-exynos/setup-i2c5.c
> index 77e1a1e..d88af7f 100644
> --- a/arch/arm/mach-exynos/setup-i2c5.c
> +++ b/arch/arm/mach-exynos/setup-i2c5.c
> @@ -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)
> diff --git a/arch/arm/mach-exynos/setup-i2c6.c
> b/arch/arm/mach-exynos/setup-i2c6.c
> index 284d12b..c590286 100644
> --- a/arch/arm/mach-exynos/setup-i2c6.c
> +++ b/arch/arm/mach-exynos/setup-i2c6.c
> @@ -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)
> diff --git a/arch/arm/mach-exynos/setup-i2c7.c
> b/arch/arm/mach-exynos/setup-i2c7.c
> index b7611ee..1bba755 100644
> --- a/arch/arm/mach-exynos/setup-i2c7.c
> +++ b/arch/arm/mach-exynos/setup-i2c7.c
> @@ -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)
> diff --git a/arch/arm/mach-s3c24xx/common-smdk.c
> b/arch/arm/mach-s3c24xx/common-smdk.c
> index 87e75a2..3b2cf6d 100644
> --- a/arch/arm/mach-s3c24xx/common-smdk.c
> +++ b/arch/arm/mach-s3c24xx/common-smdk.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c24xx/mach-amlm5900.c
> b/arch/arm/mach-s3c24xx/mach-amlm5900.c
> index ea2c4b00..f4ad99c 100644
> --- a/arch/arm/mach-s3c24xx/mach-amlm5900.c
> +++ b/arch/arm/mach-s3c24xx/mach-amlm5900.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c24xx/mach-anubis.c
> b/arch/arm/mach-s3c24xx/mach-anubis.c
> index 5a7d0c0..df890fb 100644
> --- a/arch/arm/mach-s3c24xx/mach-anubis.c
> +++ b/arch/arm/mach-s3c24xx/mach-anubis.c
> @@ -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"
> diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c
> b/arch/arm/mach-s3c24xx/mach-at2440evb.c
> index 7a05abf..00381fe 100644
> --- a/arch/arm/mach-s3c24xx/mach-at2440evb.c
> +++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c
> @@ -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"
>
> diff --git a/arch/arm/mach-s3c24xx/mach-bast.c
> b/arch/arm/mach-s3c24xx/mach-bast.c
> index 1cf1720..6a30ce7 100644
> --- a/arch/arm/mach-s3c24xx/mach-bast.c
> +++ b/arch/arm/mach-s3c24xx/mach-bast.c
> @@ -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"
> diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c
> b/arch/arm/mach-s3c24xx/mach-gta02.c
> index 92e1f93..4a96346 100644
> --- a/arch/arm/mach-s3c24xx/mach-gta02.c
> +++ b/arch/arm/mach-s3c24xx/mach-gta02.c
> @@ -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"
>
> diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c
> b/arch/arm/mach-s3c24xx/mach-h1940.c
> index bb8d008..9638b33 100644
> --- a/arch/arm/mach-s3c24xx/mach-h1940.c
> +++ b/arch/arm/mach-s3c24xx/mach-h1940.c
> @@ -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>
>
> diff --git a/arch/arm/mach-s3c24xx/mach-jive.c
> b/arch/arm/mach-s3c24xx/mach-jive.c
> index ae73ba3..28ad25b 100644
> --- a/arch/arm/mach-s3c24xx/mach-jive.c
> +++ b/arch/arm/mach-s3c24xx/mach-jive.c
> @@ -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 = {
>  };
> diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c
> b/arch/arm/mach-s3c24xx/mach-mini2440.c
> index bd6d252..c676b8e 100644
> --- a/arch/arm/mach-s3c24xx/mach-mini2440.c
> +++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c24xx/mach-n30.c
> b/arch/arm/mach-s3c24xx/mach-n30.c
> index 383d00c..c53a9bf 100644
> --- a/arch/arm/mach-s3c24xx/mach-n30.c
> +++ b/arch/arm/mach-s3c24xx/mach-n30.c
> @@ -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"
>
> diff --git a/arch/arm/mach-s3c24xx/mach-nexcoder.c
> b/arch/arm/mach-s3c24xx/mach-nexcoder.c
> index 5c05ba1..7841321 100644
> --- a/arch/arm/mach-s3c24xx/mach-nexcoder.c
> +++ b/arch/arm/mach-s3c24xx/mach-nexcoder.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c
> b/arch/arm/mach-s3c24xx/mach-osiris.c
> index 95d0772..63c20019 100644
> --- a/arch/arm/mach-s3c24xx/mach-osiris.c
> +++ b/arch/arm/mach-s3c24xx/mach-osiris.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c24xx/mach-otom.c
> b/arch/arm/mach-s3c24xx/mach-otom.c
> index bc4b6ef..bca39f0 100644
> --- a/arch/arm/mach-s3c24xx/mach-otom.c
> +++ b/arch/arm/mach-s3c24xx/mach-otom.c
> @@ -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"
> diff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c
> b/arch/arm/mach-s3c24xx/mach-qt2410.c
> index 678bbca..7b6ba13 100644
> --- a/arch/arm/mach-s3c24xx/mach-qt2410.c
> +++ b/arch/arm/mach-s3c24xx/mach-qt2410.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c
> b/arch/arm/mach-s3c24xx/mach-rx1950.c
> index 7ee73f2..379fde5 100644
> --- a/arch/arm/mach-s3c24xx/mach-rx1950.c
> +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c
> @@ -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>
>
> diff --git a/arch/arm/mach-s3c24xx/mach-rx3715.c
> b/arch/arm/mach-s3c24xx/mach-rx3715.c
> index 56af354..dacbb9a 100644
> --- a/arch/arm/mach-s3c24xx/mach-rx3715.c
> +++ b/arch/arm/mach-s3c24xx/mach-rx3715.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c24xx/mach-smdk2410.c
> b/arch/arm/mach-s3c24xx/mach-smdk2410.c
> index bdc27e7..82796b9 100644
> --- a/arch/arm/mach-s3c24xx/mach-smdk2410.c
> +++ b/arch/arm/mach-s3c24xx/mach-smdk2410.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c24xx/mach-smdk2413.c
> b/arch/arm/mach-s3c24xx/mach-smdk2413.c
> index b11451b..ce99fd8 100644
> --- a/arch/arm/mach-s3c24xx/mach-smdk2413.c
> +++ b/arch/arm/mach-s3c24xx/mach-smdk2413.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c24xx/mach-smdk2416.c
> b/arch/arm/mach-s3c24xx/mach-smdk2416.c
> index c3100a0..db2787a 100644
> --- a/arch/arm/mach-s3c24xx/mach-smdk2416.c
> +++ b/arch/arm/mach-s3c24xx/mach-smdk2416.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c24xx/mach-smdk2440.c
> b/arch/arm/mach-s3c24xx/mach-smdk2440.c
> index 83a1036..b7ff882 100644
> --- a/arch/arm/mach-s3c24xx/mach-smdk2440.c
> +++ b/arch/arm/mach-s3c24xx/mach-smdk2440.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c24xx/mach-smdk2443.c
> b/arch/arm/mach-s3c24xx/mach-smdk2443.c
> index 2092369..2568656 100644
> --- a/arch/arm/mach-s3c24xx/mach-smdk2443.c
> +++ b/arch/arm/mach-s3c24xx/mach-smdk2443.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c24xx/mach-tct_hammer.c
> b/arch/arm/mach-s3c24xx/mach-tct_hammer.c
> index fe99028..495bf5c 100644
> --- a/arch/arm/mach-s3c24xx/mach-tct_hammer.c
> +++ b/arch/arm/mach-s3c24xx/mach-tct_hammer.c
> @@ -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>
>
> diff --git a/arch/arm/mach-s3c24xx/mach-vr1000.c
> b/arch/arm/mach-s3c24xx/mach-vr1000.c
> index bd5f189..14d5b12 100644
> --- a/arch/arm/mach-s3c24xx/mach-vr1000.c
> +++ b/arch/arm/mach-s3c24xx/mach-vr1000.c
> @@ -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"
> diff --git a/arch/arm/mach-s3c24xx/mach-vstms.c
> b/arch/arm/mach-s3c24xx/mach-vstms.c
> index 94bfaa1..f1d44ae 100644
> --- a/arch/arm/mach-s3c24xx/mach-vstms.c
> +++ b/arch/arm/mach-s3c24xx/mach-vstms.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c24xx/setup-i2c.c
> b/arch/arm/mach-s3c24xx/setup-i2c.c
> index 9e90a7c..7b4f333 100644
> --- a/arch/arm/mach-s3c24xx/setup-i2c.c
> +++ b/arch/arm/mach-s3c24xx/setup-i2c.c
> @@ -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>
>
> diff --git a/arch/arm/mach-s3c24xx/simtec-audio.c
> b/arch/arm/mach-s3c24xx/simtec-audio.c
> index 11881c9..fd0ef05 100644
> --- a/arch/arm/mach-s3c24xx/simtec-audio.c
> +++ b/arch/arm/mach-s3c24xx/simtec-audio.c
> @@ -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"
> diff --git a/arch/arm/mach-s3c24xx/simtec-usb.c
> b/arch/arm/mach-s3c24xx/simtec-usb.c
> index d91c1a7..17f8356 100644
> --- a/arch/arm/mach-s3c24xx/simtec-usb.c
> +++ b/arch/arm/mach-s3c24xx/simtec-usb.c
> @@ -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"
> diff --git a/arch/arm/mach-s3c64xx/dev-audio.c
> b/arch/arm/mach-s3c64xx/dev-audio.c
> index 124fd5d..35f3e07 100644
> --- a/arch/arm/mach-s3c64xx/dev-audio.c
> +++ b/arch/arm/mach-s3c64xx/dev-audio.c
> @@ -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[] = {
> diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c
> b/arch/arm/mach-s3c64xx/mach-anw6410.c
> index ffa29dd..15c58df 100644
> --- a/arch/arm/mach-s3c64xx/mach-anw6410.c
> +++ b/arch/arm/mach-s3c64xx/mach-anw6410.c
> @@ -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>
>
> diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
> b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
> index 9e382e7..181aa994 100644
> --- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
> +++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
> @@ -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>
>
> diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c
> b/arch/arm/mach-s3c64xx/mach-crag6410.c
> index 09cd812..717d675 100644
> --- a/arch/arm/mach-s3c64xx/mach-crag6410.c
> +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
> @@ -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"
> diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c
> b/arch/arm/mach-s3c64xx/mach-hmt.c
> index 6890881..02222b3 100644
> --- a/arch/arm/mach-s3c64xx/mach-hmt.c
> +++ b/arch/arm/mach-s3c64xx/mach-hmt.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c
> b/arch/arm/mach-s3c64xx/mach-mini6410.c
> index 5539a255..09311cc 100644
> --- a/arch/arm/mach-s3c64xx/mach-mini6410.c
> +++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c64xx/mach-ncp.c
> b/arch/arm/mach-s3c64xx/mach-ncp.c
> index cad2e05..46ee88d 100644
> --- a/arch/arm/mach-s3c64xx/mach-ncp.c
> +++ b/arch/arm/mach-s3c64xx/mach-ncp.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c
> b/arch/arm/mach-s3c64xx/mach-real6410.c
> index 326b216..6daca20 100644
> --- a/arch/arm/mach-s3c64xx/mach-real6410.c
> +++ b/arch/arm/mach-s3c64xx/mach-real6410.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c
> b/arch/arm/mach-s3c64xx/mach-smartq.c
> index ceeb1de..c6d7390 100644
> --- a/arch/arm/mach-s3c64xx/mach-smartq.c
> +++ b/arch/arm/mach-s3c64xx/mach-smartq.c
> @@ -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>
>
> diff --git a/arch/arm/mach-s3c64xx/mach-smdk6400.c
> b/arch/arm/mach-s3c64xx/mach-smdk6400.c
> index b0f4525..a928fae 100644
> --- a/arch/arm/mach-s3c64xx/mach-smdk6400.c
> +++ b/arch/arm/mach-s3c64xx/mach-smdk6400.c
> @@ -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"
>
> diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c
> b/arch/arm/mach-s3c64xx/mach-smdk6410.c
> index 0fe4f15..2547a88 100644
> --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
> +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
> @@ -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>
> diff --git a/arch/arm/mach-s3c64xx/setup-i2c0.c
> b/arch/arm/mach-s3c64xx/setup-i2c0.c
> index 241af94..40666ba 100644
> --- a/arch/arm/mach-s3c64xx/setup-i2c0.c
> +++ b/arch/arm/mach-s3c64xx/setup-i2c0.c
> @@ -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)
> diff --git a/arch/arm/mach-s3c64xx/setup-i2c1.c
> b/arch/arm/mach-s3c64xx/setup-i2c1.c
> index 3d13a96..3fdb24c 100644
> --- a/arch/arm/mach-s3c64xx/setup-i2c1.c
> +++ b/arch/arm/mach-s3c64xx/setup-i2c1.c
> @@ -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)
> diff --git a/arch/arm/mach-s3c64xx/setup-ide.c
> b/arch/arm/mach-s3c64xx/setup-ide.c
> index 41b4256..648d8b8 100644
> --- a/arch/arm/mach-s3c64xx/setup-ide.c
> +++ b/arch/arm/mach-s3c64xx/setup-ide.c
> @@ -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)
>  {
> diff --git a/arch/arm/mach-s5p64x0/dev-audio.c
> b/arch/arm/mach-s5p64x0/dev-audio.c
> index 91113dd..a0d6edf 100644
> --- a/arch/arm/mach-s5p64x0/dev-audio.c
> +++ b/arch/arm/mach-s5p64x0/dev-audio.c
> @@ -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>
> diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c
> b/arch/arm/mach-s5p64x0/mach-smdk6440.c
> index 92fefad..dea78a8 100644
> --- a/arch/arm/mach-s5p64x0/mach-smdk6440.c
> +++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c
> @@ -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>
> diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c
> b/arch/arm/mach-s5p64x0/mach-smdk6450.c
> index e2335ec..6f14fc7 100644
> --- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
> +++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c
> @@ -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>
> diff --git a/arch/arm/mach-s5p64x0/setup-i2c0.c
> b/arch/arm/mach-s5p64x0/setup-i2c0.c
> index 46b4639..a32edc5 100644
> --- a/arch/arm/mach-s5p64x0/setup-i2c0.c
> +++ b/arch/arm/mach-s5p64x0/setup-i2c0.c
> @@ -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>
>
> diff --git a/arch/arm/mach-s5p64x0/setup-i2c1.c
> b/arch/arm/mach-s5p64x0/setup-i2c1.c
> index 6ad3b98..ca2c5c7 100644
> --- a/arch/arm/mach-s5p64x0/setup-i2c1.c
> +++ b/arch/arm/mach-s5p64x0/setup-i2c1.c
> @@ -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>
>
> diff --git a/arch/arm/mach-s5pc100/dev-audio.c
> b/arch/arm/mach-s5pc100/dev-audio.c
> index 9d4bde3..1cc252c 100644
> --- a/arch/arm/mach-s5pc100/dev-audio.c
> +++ b/arch/arm/mach-s5pc100/dev-audio.c
> @@ -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>
> diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c
> b/arch/arm/mach-s5pc100/mach-smdkc100.c
> index 0c3ae38..5d2c093 100644
> --- a/arch/arm/mach-s5pc100/mach-smdkc100.c
> +++ b/arch/arm/mach-s5pc100/mach-smdkc100.c
> @@ -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>
>
> diff --git a/arch/arm/mach-s5pc100/setup-i2c0.c
> b/arch/arm/mach-s5pc100/setup-i2c0.c
> index eaef7a3..89a6a76 100644
> --- a/arch/arm/mach-s5pc100/setup-i2c0.c
> +++ b/arch/arm/mach-s5pc100/setup-i2c0.c
> @@ -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)
> diff --git a/arch/arm/mach-s5pc100/setup-i2c1.c
> b/arch/arm/mach-s5pc100/setup-i2c1.c
> index aaff74a..faa667e 100644
> --- a/arch/arm/mach-s5pc100/setup-i2c1.c
> +++ b/arch/arm/mach-s5pc100/setup-i2c1.c
> @@ -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)
> diff --git a/arch/arm/mach-s5pv210/dev-audio.c
> b/arch/arm/mach-s5pv210/dev-audio.c
> index 8367749..0a5480b 100644
> --- a/arch/arm/mach-s5pv210/dev-audio.c
> +++ b/arch/arm/mach-s5pv210/dev-audio.c
> @@ -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>
> diff --git a/arch/arm/mach-s5pv210/mach-goni.c
> b/arch/arm/mach-s5pv210/mach-goni.c
> index 822a559..00f1e47 100644
> --- a/arch/arm/mach-s5pv210/mach-goni.c
> +++ b/arch/arm/mach-s5pv210/mach-goni.c
> @@ -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>
> diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c
> b/arch/arm/mach-s5pv210/mach-smdkc110.c
> index dfc2923..d9c99fc 100644
> --- a/arch/arm/mach-s5pv210/mach-smdkc110.c
> +++ b/arch/arm/mach-s5pv210/mach-smdkc110.c
> @@ -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>
> diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c
> b/arch/arm/mach-s5pv210/mach-smdkv210.c
> index 918b23d..7d6fab4 100644
> --- a/arch/arm/mach-s5pv210/mach-smdkv210.c
> +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
> @@ -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>
> diff --git a/arch/arm/mach-s5pv210/mach-torbreck.c
> b/arch/arm/mach-s5pv210/mach-torbreck.c
> index 74e99bc..18785cb 100644
> --- a/arch/arm/mach-s5pv210/mach-torbreck.c
> +++ b/arch/arm/mach-s5pv210/mach-torbreck.c
> @@ -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"
> diff --git a/arch/arm/mach-s5pv210/setup-i2c0.c
> b/arch/arm/mach-s5pv210/setup-i2c0.c
> index 0f1cc3a..4a15849 100644
> --- a/arch/arm/mach-s5pv210/setup-i2c0.c
> +++ b/arch/arm/mach-s5pv210/setup-i2c0.c
> @@ -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)
> diff --git a/arch/arm/mach-s5pv210/setup-i2c1.c
> b/arch/arm/mach-s5pv210/setup-i2c1.c
> index f61365a..4777f6b 100644
> --- a/arch/arm/mach-s5pv210/setup-i2c1.c
> +++ b/arch/arm/mach-s5pv210/setup-i2c1.c
> @@ -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)
> diff --git a/arch/arm/mach-s5pv210/setup-i2c2.c
> b/arch/arm/mach-s5pv210/setup-i2c2.c
> index 2f91b5c..bbce6c7 100644
> --- a/arch/arm/mach-s5pv210/setup-i2c2.c
> +++ b/arch/arm/mach-s5pv210/setup-i2c2.c
> @@ -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)
> diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
> index 74e31ce..07913ac 100644
> --- a/arch/arm/plat-samsung/devs.c
> +++ b/arch/arm/plat-samsung/devs.c
> @@ -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);
>
> diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c
> index 1b372c2..63ffb00 100644
> --- a/drivers/ata/pata_samsung_cf.c
> +++ b/drivers/ata/pata_samsung_cf.c
> @@ -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"
> diff --git a/drivers/hwmon/s3c-hwmon.c b/drivers/hwmon/s3c-hwmon.c
> index b7975f8..fe11b95 100644
> --- a/drivers/hwmon/s3c-hwmon.c
> +++ b/drivers/hwmon/s3c-hwmon.c
> @@ -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;
> diff --git a/drivers/i2c/busses/i2c-s3c2410.c
> b/drivers/i2c/busses/i2c-s3c2410.c
> index 5ae3b02..4d07dea 100644
> --- a/drivers/i2c/busses/i2c-s3c2410.c
> +++ b/drivers/i2c/busses/i2c-s3c2410.c
> @@ -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)
> diff --git a/drivers/input/touchscreen/s3c2410_ts.c
> b/drivers/input/touchscreen/s3c2410_ts.c
> index bf1a064..df9e816 100644
> --- a/drivers/input/touchscreen/s3c2410_ts.c
> +++ b/drivers/input/touchscreen/s3c2410_ts.c
> @@ -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))
>
> diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c
> index 942f0ea..e1a0df6 100644
> --- a/drivers/leds/leds-s3c24xx.c
> +++ b/drivers/leds/leds-s3c24xx.c
> @@ -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 */
>
> diff --git a/drivers/media/video/s5p-fimc/mipi-csis.c
> b/drivers/media/video/s5p-fimc/mipi-csis.c
> index 2f73d9e..5e89843 100644
> --- a/drivers/media/video/s5p-fimc/mipi-csis.c
> +++ b/drivers/media/video/s5p-fimc/mipi-csis.c
> @@ -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;
> diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
> index bd5a5cc..4638dda 100644
> --- a/drivers/mmc/host/s3cmci.c
> +++ b/drivers/mmc/host/s3cmci.c
> @@ -27,7 +27,7 @@
>
>  #include <mach/regs-sdi.h>
>
> -#include <plat/mci.h>
> +#include <linux/platform_data/mmc-s3cmci.h>
>
>  #include "s3cmci.h"
>
> diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
> index 91121f3..d804061 100644
> --- a/drivers/mtd/nand/s3c2410.c
> +++ b/drivers/mtd/nand/s3c2410.c
> @@ -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;
> diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
> index d1c8441f..0e2a022 100644
> --- a/drivers/spi/spi-s3c64xx.c
> +++ b/drivers/spi/spi-s3c64xx.c
> @@ -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
>
> diff --git a/drivers/usb/gadget/s3c2410_udc.c
> b/drivers/usb/gadget/s3c2410_udc.c
> index f2e51f5..f006045 100644
> --- a/drivers/usb/gadget/s3c2410_udc.c
> +++ b/drivers/usb/gadget/s3c2410_udc.c
> @@ -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"
> diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
> index 9d8f1dd..dfb14c7 100644
> --- a/drivers/usb/host/ehci-s5p.c
> +++ b/drivers/usb/host/ehci-s5p.c
> @@ -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)
> diff --git a/drivers/usb/host/ohci-exynos.c
> b/drivers/usb/host/ohci-exynos.c
> index fc3091b..20a5008 100644
> --- a/drivers/usb/host/ohci-exynos.c
> +++ b/drivers/usb/host/ohci-exynos.c
> @@ -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 {
> diff --git a/drivers/usb/host/ohci-s3c2410.c
> b/drivers/usb/host/ohci-s3c2410.c
> index 664c869..0d2309c 100644
> --- a/drivers/usb/host/ohci-s3c2410.c
> +++ b/drivers/usb/host/ohci-s3c2410.c
> @@ -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)
>
> diff --git a/arch/arm/plat-samsung/include/plat/audio.h
> b/include/linux/platform_data/asoc-s3c.h
> similarity index 100%
> rename from arch/arm/plat-samsung/include/plat/audio.h
> rename to include/linux/platform_data/asoc-s3c.h
> diff --git a/arch/arm/plat-samsung/include/plat/audio-simtec.h
> b/include/linux/platform_data/asoc-s3c24xx_simtec.h
> similarity index 100%
> rename from arch/arm/plat-samsung/include/plat/audio-simtec.h
> rename to include/linux/platform_data/asoc-s3c24xx_simtec.h
> diff --git a/arch/arm/plat-samsung/include/plat/ata.h
> b/include/linux/platform_data/ata-samsung_cf.h
> similarity index 100%
> rename from arch/arm/plat-samsung/include/plat/ata.h
> rename to include/linux/platform_data/ata-samsung_cf.h
> diff --git a/arch/arm/plat-samsung/include/plat/hwmon.h
> b/include/linux/platform_data/hwmon-s3c.h
> similarity index 100%
> rename from arch/arm/plat-samsung/include/plat/hwmon.h
> rename to include/linux/platform_data/hwmon-s3c.h
> diff --git a/arch/arm/plat-samsung/include/plat/iic.h
> b/include/linux/platform_data/i2c-s3c2410.h
> similarity index 100%
> rename from arch/arm/plat-samsung/include/plat/iic.h
> rename to include/linux/platform_data/i2c-s3c2410.h
> diff --git a/arch/arm/mach-s3c24xx/include/mach/leds-gpio.h
> b/include/linux/platform_data/leds-s3c24xx.h
> similarity index 100%
> rename from arch/arm/mach-s3c24xx/include/mach/leds-gpio.h
> rename to include/linux/platform_data/leds-s3c24xx.h
> diff --git a/arch/arm/plat-samsung/include/plat/mipi_csis.h
> b/include/linux/platform_data/mipi-csis.h
> similarity index 100%
> rename from arch/arm/plat-samsung/include/plat/mipi_csis.h
> rename to include/linux/platform_data/mipi-csis.h
> diff --git a/arch/arm/plat-samsung/include/plat/mci.h
> b/include/linux/platform_data/mmc-s3cmci.h
> similarity index 100%
> rename from arch/arm/plat-samsung/include/plat/mci.h
> rename to include/linux/platform_data/mmc-s3cmci.h
> diff --git a/arch/arm/plat-samsung/include/plat/nand.h
> b/include/linux/platform_data/mtd-nand-s3c2410.h
> similarity index 100%
> rename from arch/arm/plat-samsung/include/plat/nand.h
> rename to include/linux/platform_data/mtd-nand-s3c2410.h
> diff --git a/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h
> b/include/linux/platform_data/spi-s3c64xx.h
> similarity index 100%
> rename from arch/arm/plat-samsung/include/plat/s3c64xx-spi.h
> rename to include/linux/platform_data/spi-s3c64xx.h
> diff --git a/arch/arm/plat-samsung/include/plat/ts.h
> b/include/linux/platform_data/touchscreen-s3c2410.h
> similarity index 100%
> rename from arch/arm/plat-samsung/include/plat/ts.h
> rename to include/linux/platform_data/touchscreen-s3c2410.h
> diff --git a/arch/arm/plat-samsung/include/plat/ehci.h
> b/include/linux/platform_data/usb-ehci-s5p.h
> similarity index 100%
> rename from arch/arm/plat-samsung/include/plat/ehci.h
> rename to include/linux/platform_data/usb-ehci-s5p.h
> diff --git a/arch/arm/mach-exynos/include/mach/ohci.h
> b/include/linux/platform_data/usb-exynos.h
> similarity index 100%
> rename from arch/arm/mach-exynos/include/mach/ohci.h
> rename to include/linux/platform_data/usb-exynos.h
> diff --git a/arch/arm/plat-samsung/include/plat/usb-control.h
> b/include/linux/platform_data/usb-ohci-s3c2410.h
> similarity index 100%
> rename from arch/arm/plat-samsung/include/plat/usb-control.h
> rename to include/linux/platform_data/usb-ohci-s3c2410.h
> diff --git a/arch/arm/plat-samsung/include/plat/udc.h
> b/include/linux/platform_data/usb-s3c2410_udc.h
> similarity index 100%
> rename from arch/arm/plat-samsung/include/plat/udc.h
> rename to include/linux/platform_data/usb-s3c2410_udc.h
> diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
> index 3d04c1f..14fbcd3 100644
> --- a/sound/soc/samsung/ac97.c
> +++ b/sound/soc/samsung/ac97.c
> @@ -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"
>
> diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
> index 6ac7b82..40b00a1 100644
> --- a/sound/soc/samsung/i2s.c
> +++ b/sound/soc/samsung/i2s.c
> @@ -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"
> diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
> index 89b0646..c860819 100644
> --- a/sound/soc/samsung/pcm.c
> +++ b/sound/soc/samsung/pcm.c
> @@ -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"
> diff --git a/sound/soc/samsung/s3c24xx_simtec.c
> b/sound/soc/samsung/s3c24xx_simtec.c
> index 656d5af..335a7d8 100644
> --- a/sound/soc/samsung/s3c24xx_simtec.c
> +++ b/sound/soc/samsung/s3c24xx_simtec.c
> @@ -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"
> diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c
> index a5a56a1..bc24c7a 100644
> --- a/sound/soc/samsung/spdif.c
> +++ b/sound/soc/samsung/spdif.c
> @@ -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@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>
Sekhar Nori - Sept. 12, 2012, 5:55 p.m.
On 9/11/2012 10:34 PM, Arnd Bergmann wrote:
> On Tuesday 11 September 2012, Vaibhav Hiremath wrote:
>> On 9/11/2012 7:54 PM, Shilimkar, Santosh wrote:
>>> On Tue, Sep 11, 2012 at 7:47 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>>>> On Tuesday 11 September 2012, Shilimkar, Santosh wrote:
>>>>> 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.
>>>
>>
>> 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

Patch

diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index c534698..b9df845 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -35,7 +35,7 @@ 
 #include <asm/mach/map.h>
 
 #include <plat/board-ams-delta.h>
-#include <plat/keypad.h>
+#include <linux/platform_data/keypad-omap.h>
 #include <plat/mux.h>
 #include <plat/board.h>
 
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index 6872f3f..e8f772b 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -31,7 +31,7 @@ 
 #include <plat/mux.h>
 #include <plat/flash.h>
 #include <plat/fpga.h>
-#include <plat/keypad.h>
+#include <linux/platform_data/keypad-omap.h>
 #include <plat/board.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 44a4ab1..f59aa80 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -40,7 +40,7 @@ 
 #include <plat/dma.h>
 #include <plat/tc.h>
 #include <plat/irda.h>
-#include <plat/keypad.h>
+#include <linux/platform_data/keypad-omap.h>
 #include <plat/flash.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 86cb5a0..e20af3f 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -40,7 +40,7 @@ 
 
 #include <plat/mux.h>
 #include <plat/tc.h>
-#include <plat/keypad.h>
+#include <linux/platform_data/keypad-omap.h>
 #include <plat/dma.h>
 #include <plat/flash.h>
 
diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c
index b3f6e94..20ec5a8 100644
--- a/arch/arm/mach-omap1/board-htcherald.c
+++ b/arch/arm/mach-omap1/board-htcherald.c
@@ -43,7 +43,7 @@ 
 
 #include <plat/omap7xx.h>
 #include <plat/board.h>
-#include <plat/keypad.h>
+#include <linux/platform_data/keypad-omap.h>
 #include <plat/mmc.h>
 
 #include <mach/irqs.h>
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index f21c296..083afa7 100644
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -35,7 +35,7 @@ 
 #include <plat/flash.h>
 #include <plat/fpga.h>
 #include <plat/tc.h>
-#include <plat/keypad.h>
+#include <linux/platform_data/keypad-omap.h>
 #include <plat/mmc.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 2c0ca8f..657bf7c 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -27,8 +27,8 @@ 
 
 #include <plat/mux.h>
 #include <plat/board.h>
-#include <plat/keypad.h>
-#include <plat/lcd_mipid.h>
+#include <linux/platform_data/keypad-omap.h>
+#include <linux/platform_data/lcd-mipid.h>
 #include <plat/mmc.h>
 #include <plat/clock.h>
 
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 8784705..1c42a96 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -302,7 +302,7 @@  static struct omap_lcd_config osk_lcd_config __initdata = {
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 
-#include <plat/keypad.h>
+#include <linux/platform_data/keypad-omap.h>
 
 static struct at24_platform_data at24c04 = {
 	.byte_len	= SZ_4K / 8,
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index 26bcb9d..ed1cd69 100644
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@ -39,7 +39,7 @@ 
 #include <plat/dma.h>
 #include <plat/board.h>
 #include <plat/irda.h>
-#include <plat/keypad.h>
+#include <linux/platform_data/keypad-omap.h>
 
 #include <mach/hardware.h>
 #include <mach/usb.h>
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c
index 4d09944..f4b9458 100644
--- a/arch/arm/mach-omap1/board-palmtt.c
+++ b/arch/arm/mach-omap1/board-palmtt.c
@@ -39,7 +39,7 @@ 
 #include <plat/tc.h>
 #include <plat/board.h>
 #include <plat/irda.h>
-#include <plat/keypad.h>
+#include <linux/platform_data/keypad-omap.h>
 
 #include <mach/hardware.h>
 #include <mach/usb.h>
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index 3559803..fb08004 100644
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -41,7 +41,7 @@ 
 #include <plat/tc.h>
 #include <plat/board.h>
 #include <plat/irda.h>
-#include <plat/keypad.h>
+#include <linux/platform_data/keypad-omap.h>
 
 #include <mach/hardware.h>
 #include <mach/usb.h>
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 703d55e..f5e2c00 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -31,7 +31,7 @@ 
 #include <plat/mux.h>
 #include <plat/fpga.h>
 #include <plat/flash.h>
-#include <plat/keypad.h>
+#include <linux/platform_data/keypad-omap.h>
 #include <plat/board.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index 8c665bd..51325a9 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -39,7 +39,7 @@ 
 #include <plat/irda.h>
 #include <plat/tc.h>
 #include <plat/board.h>
-#include <plat/keypad.h>
+#include <linux/platform_data/keypad-omap.h>
 #include <plat/board-sx1.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c
index adf0097..b1a5b47 100644
--- a/arch/arm/mach-omap1/mcbsp.c
+++ b/arch/arm/mach-omap1/mcbsp.c
@@ -22,7 +22,7 @@ 
 #include <plat/dma.h>
 #include <plat/mux.h>
 #include <plat/cpu.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 
 #include <mach/irqs.h>
 
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index a98c688..76d03d3 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -30,7 +30,7 @@ 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/mcspi.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 #include <plat/board.h>
 #include <plat/usb.h>
 #include "common.h"
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 97d7190..3f844f4 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -39,13 +39,13 @@ 
 
 #include <plat/board.h>
 #include "common.h"
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-omap2.h>
 #include <plat/gpmc.h>
 #include <plat/usb.h>
 #include <video/omapdss.h>
 #include <video/omap-panel-generic-dpi.h>
 #include <video/omap-panel-tfp410.h>
-#include <plat/mcspi.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 
 #include <mach/hardware.h>
 
diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c
index a33ad46..e1811ba 100644
--- a/arch/arm/mach-omap2/board-cm-t3517.c
+++ b/arch/arm/mach-omap2/board-cm-t3517.c
@@ -41,7 +41,7 @@ 
 #include <plat/board.h>
 #include "common.h"
 #include <plat/usb.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-omap2.h>
 #include <plat/gpmc.h>
 
 #include <mach/am35xx.h>
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
index 6567c1c..e4456c2 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -43,13 +43,13 @@ 
 #include <plat/board.h>
 #include "common.h"
 #include <plat/gpmc.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-omap2.h>
 #include <plat/usb.h>
 #include <video/omapdss.h>
 #include <video/omap-panel-generic-dpi.h>
 #include <video/omap-panel-tfp410.h>
 
-#include <plat/mcspi.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/input/matrix_keypad.h>
 #include <linux/spi/spi.h>
 #include <linux/dm9000.h>
diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c
index 53c39d2..a1ef5f0 100644
--- a/arch/arm/mach-omap2/board-flash.c
+++ b/arch/arm/mach-omap2/board-flash.c
@@ -19,8 +19,8 @@ 
 #include <plat/irqs.h>
 
 #include <plat/gpmc.h>
-#include <plat/nand.h>
-#include <plat/onenand.h>
+#include <linux/platform_data/mtd-nand-omap2.h>
+#include <linux/platform_data/mtd-onenand-omap2.h>
 #include <plat/tc.h>
 
 #include "board-flash.h"
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 7491529..4e5de5a 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -35,7 +35,7 @@ 
 #include <plat/usb.h>
 #include <video/omapdss.h>
 #include <video/omap-panel-tfp410.h>
-#include <plat/onenand.h>
+#include <linux/platform_data/mtd-onenand-omap2.h>
 
 #include "mux.h"
 #include "hsmmc.h"
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index ef9e829..b5ba08b 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -34,7 +34,7 @@ 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/mcspi.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 #include <plat/board.h>
 #include "common.h"
 #include <plat/gpmc.h>
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index 677357f..a60c575 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -29,8 +29,8 @@ 
 #include "common.h"
 #include <plat/menelaus.h>
 #include <mach/irqs.h>
-#include <plat/mcspi.h>
-#include <plat/onenand.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
+#include <linux/platform_data/mtd-onenand-omap2.h>
 #include <plat/mmc.h>
 #include <plat/serial.h>
 
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 6202fc7..b483d49 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -44,7 +44,7 @@ 
 #include <video/omapdss.h>
 #include <video/omap-panel-tfp410.h>
 #include <plat/gpmc.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-omap2.h>
 #include <plat/usb.h>
 #include <plat/omap_device.h>
 
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index ef230a0..89db942 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -47,9 +47,9 @@ 
 
 #include <plat/board.h>
 #include <plat/usb.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-omap2.h>
 #include "common.h"
-#include <plat/mcspi.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 #include <video/omapdss.h>
 #include <video/omap-panel-tfp410.h>
 
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 57aebee..44ca395 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -43,10 +43,10 @@ 
 #include <plat/board.h>
 #include "common.h"
 #include <mach/hardware.h>
-#include <plat/mcspi.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 #include <plat/usb.h>
 #include <video/omapdss.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-omap2.h>
 
 #include "mux.h"
 #include "sdram-micron-mt46h32m32lf-6.h"
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index b318f56..e967363 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -38,13 +38,13 @@ 
 #include <plat/board.h>
 #include "common.h"
 #include <plat/gpmc.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-omap2.h>
 #include <plat/usb.h>
 #include <video/omapdss.h>
 #include <video/omap-panel-generic-dpi.h>
 #include <video/omap-panel-tfp410.h>
 
-#include <plat/mcspi.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/input/matrix_keypad.h>
 #include <linux/spi/spi.h>
 #include <linux/interrupt.h>
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
index 485d14d..7b4a604 100644
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@ -29,7 +29,7 @@ 
 #include <linux/mtd/nand.h>
 #include <linux/mmc/host.h>
 
-#include <plat/mcspi.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/spi/spi.h>
 
 #include <linux/spi/ads7846.h>
@@ -47,7 +47,7 @@ 
 #include <plat/board.h>
 #include "common.h"
 #include <plat/gpmc.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-omap2.h>
 #include <plat/usb.h>
 
 #include "mux.h"
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 779734d..db964e6 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -49,8 +49,8 @@ 
 #include <video/omap-panel-tfp410.h>
 #include <plat/gpmc.h>
 #include <mach/hardware.h>
-#include <plat/nand.h>
-#include <plat/mcspi.h>
+#include <linux/platform_data/mtd-nand-omap2.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 #include <plat/mux.h>
 #include <plat/usb.h>
 
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c
index 0ad1bb3b..bbfbe56 100644
--- a/arch/arm/mach-omap2/board-rm680.c
+++ b/arch/arm/mach-omap2/board-rm680.c
@@ -26,7 +26,7 @@ 
 #include <plat/usb.h>
 #include <plat/gpmc.h>
 #include "common.h"
-#include <plat/onenand.h>
+#include <linux/platform_data/mtd-onenand-omap2.h>
 
 #include "mux.h"
 #include "hsmmc.h"
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index df2534d..9bfbb61 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -27,12 +27,12 @@ 
 #include <linux/power/isp1704_charger.h>
 #include <asm/system_info.h>
 
-#include <plat/mcspi.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 #include <plat/board.h>
 #include "common.h"
 #include <plat/dma.h>
 #include <plat/gpmc.h>
-#include <plat/onenand.h>
+#include <linux/platform_data/mtd-onenand-omap2.h>
 #include <plat/gpmc-smc91x.h>
 
 #include <mach/board-rx51.h>
diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c
index 2c1289b..7ef0994 100644
--- a/arch/arm/mach-omap2/board-rx51-video.c
+++ b/arch/arm/mach-omap2/board-rx51-video.c
@@ -17,7 +17,7 @@ 
 #include <asm/mach-types.h>
 #include <video/omapdss.h>
 #include <plat/vram.h>
-#include <plat/mcspi.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 
 #include <mach/board-rx51.h>
 
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
index 345dd93..779c67e 100644
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@ -23,7 +23,7 @@ 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/mcspi.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 #include <plat/board.h>
 #include "common.h"
 #include <plat/dma.h>
diff --git a/arch/arm/mach-omap2/board-zoom-display.c b/arch/arm/mach-omap2/board-zoom-display.c
index 28187f1..660a2932 100644
--- a/arch/arm/mach-omap2/board-zoom-display.c
+++ b/arch/arm/mach-omap2/board-zoom-display.c
@@ -14,7 +14,7 @@ 
 #include <linux/gpio.h>
 #include <linux/i2c/twl.h>
 #include <linux/spi/spi.h>
-#include <plat/mcspi.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 #include <video/omapdss.h>
 #include <mach/board-zoom.h>
 
diff --git a/arch/arm/mach-omap2/common-board-devices.c b/arch/arm/mach-omap2/common-board-devices.c
index 1473474..eedb6d0 100644
--- a/arch/arm/mach-omap2/common-board-devices.c
+++ b/arch/arm/mach-omap2/common-board-devices.c
@@ -24,8 +24,8 @@ 
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 
-#include <plat/mcspi.h>
-#include <plat/nand.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
+#include <linux/platform_data/mtd-nand-omap2.h>
 
 #include "common-board-devices.h"
 
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index c00c689..bd1b907 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -385,7 +385,7 @@  static inline void omap_init_hdmi_audio(void) {}
 
 #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
 
-#include <plat/mcspi.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 
 static int __init omap_mcspi_init(struct omap_hwmod *oh, void *unused)
 {
diff --git a/arch/arm/mach-omap2/dsp.c b/arch/arm/mach-omap2/dsp.c
index a636ebc..9838810 100644
--- a/arch/arm/mach-omap2/dsp.c
+++ b/arch/arm/mach-omap2/dsp.c
@@ -30,7 +30,7 @@ 
 #include <plat/omap-pm.h>
 #endif
 
-#include <plat/dsp.h>
+#include <linux/platform_data/dsp-omap.h>
 
 static struct platform_device *omap_dsp_pdev;
 
diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c
index 386dec8..af6f177 100644
--- a/arch/arm/mach-omap2/gpmc-nand.c
+++ b/arch/arm/mach-omap2/gpmc-nand.c
@@ -17,7 +17,7 @@ 
 #include <asm/mach/flash.h>
 
 #include <plat/cpu.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-omap2.h>
 #include <plat/board.h>
 #include <plat/gpmc.h>
 
diff --git a/arch/arm/mach-omap2/gpmc-onenand.c b/arch/arm/mach-omap2/gpmc-onenand.c
index a0fa9bb..d27b02d 100644
--- a/arch/arm/mach-omap2/gpmc-onenand.c
+++ b/arch/arm/mach-omap2/gpmc-onenand.c
@@ -19,7 +19,7 @@ 
 #include <asm/mach/flash.h>
 
 #include <plat/cpu.h>
-#include <plat/onenand.h>
+#include <linux/platform_data/mtd-onenand-omap2.h>
 #include <plat/board.h>
 #include <plat/gpmc.h>
 
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index 577cb77..4ee08c6 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -21,7 +21,7 @@ 
 #include <mach/irqs.h>
 #include <plat/dma.h>
 #include <plat/cpu.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 #include <plat/omap_device.h>
 #include <linux/pm_runtime.h>
 
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index 50cfab6..558c300 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -19,7 +19,7 @@ 
 #include <plat/serial.h>
 #include <plat/i2c.h>
 #include <plat/gpio.h>
-#include <plat/mcspi.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 #include <plat/dmtimer.h>
 #include <plat/l3_2xxx.h>
 #include <plat/l4_2xxx.h>
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index 58b5bc1..d662766 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -19,8 +19,8 @@ 
 #include <plat/serial.h>
 #include <plat/i2c.h>
 #include <plat/gpio.h>
-#include <plat/mcbsp.h>
-#include <plat/mcspi.h>
+#include <linux/platform_data/dsp-mcbsp.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 #include <plat/dmtimer.h>
 #include <plat/mmc.h>
 #include <plat/l3_2xxx.h>
diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
index afad69c..161ae0a 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
@@ -13,7 +13,7 @@ 
 #include <plat/gpio.h>
 #include <plat/dma.h>
 #include <plat/dmtimer.h>
-#include <plat/mcspi.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 
 #include <mach/irqs.h>
 
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index c9e3820..656bb7f 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -26,8 +26,8 @@ 
 #include <plat/i2c.h>
 #include <plat/gpio.h>
 #include <plat/mmc.h>
-#include <plat/mcbsp.h>
-#include <plat/mcspi.h>
+#include <linux/platform_data/dsp-mcbsp.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 #include <plat/dmtimer.h>
 
 #include "omap_hwmod_common_data.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 242aee4..3a06e7d 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -26,8 +26,8 @@ 
 #include <plat/i2c.h>
 #include <plat/gpio.h>
 #include <plat/dma.h>
-#include <plat/mcspi.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 #include <plat/mmc.h>
 #include <plat/dmtimer.h>
 #include <plat/common.h>
diff --git a/arch/arm/mach-omap2/voltage.h b/arch/arm/mach-omap2/voltage.h
index 0ac2caf..7abf1c0 100644
--- a/arch/arm/mach-omap2/voltage.h
+++ b/arch/arm/mach-omap2/voltage.h
@@ -16,7 +16,7 @@ 
 
 #include <linux/err.h>
 
-#include <plat/voltage.h>
+#include <linux/platform_data/smartreflex-omap.h>
 
 #include "vc.h"
 #include "vp.h"
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 89a3723..f18b73b 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -19,7 +19,7 @@ 
 #include <plat/common.h>
 #include <plat/board.h>
 #include <plat/vram.h>
-#include <plat/dsp.h>
+#include <linux/platform_data/dsp-omap.h>
 #include <plat/dma.h>
 
 #include <plat/omap-secure.h>
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index a0222db..8aaa326 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -36,7 +36,7 @@ 
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <asm/gpio.h>
-#include <plat/keypad.h>
+#include <linux/platform_data/keypad-omap.h>
 #include <plat/menelaus.h>
 #include <asm/irq.h>
 #include <mach/hardware.h>
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index ac4fd75..5efaac6 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -29,7 +29,7 @@ 
 
 #include <plat/dma.h>
 #include <plat/gpmc.h>
-#include <plat/nand.h>
+#include <linux/platform_data/mtd-nand-omap2.h>
 
 #define	DRIVER_NAME	"omap2-nand"
 #define	OMAP_NAND_TIMEOUT_MS	5000
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 398a827..f9017b3 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -39,7 +39,7 @@ 
 
 #include <asm/mach/flash.h>
 #include <plat/gpmc.h>
-#include <plat/onenand.h>
+#include <linux/platform_data/mtd-onenand-omap2.h>
 #include <asm/gpio.h>
 
 #include <plat/dma.h>
diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c
index a1f7ac1..b54504e 100644
--- a/drivers/remoteproc/omap_remoteproc.c
+++ b/drivers/remoteproc/omap_remoteproc.c
@@ -29,7 +29,7 @@ 
 #include <linux/remoteproc.h>
 
 #include <plat/mailbox.h>
-#include <plat/remoteproc.h>
+#include <linux/platform_data/remoteproc-omap.h>
 
 #include "omap_remoteproc.h"
 #include "remoteproc_internal.h"
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index b2fb141..b9b7ad0 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -42,7 +42,7 @@ 
 #include <linux/spi/spi.h>
 
 #include <plat/clock.h>
-#include <plat/mcspi.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
 
 #define OMAP2_MCSPI_MAX_FREQ		48000000
 #define SPI_AUTOSUSPEND_TIMEOUT		2000
diff --git a/drivers/staging/tidspbridge/core/dsp-clock.c b/drivers/staging/tidspbridge/core/dsp-clock.c
index c7df34e..346fa559 100644
--- a/drivers/staging/tidspbridge/core/dsp-clock.c
+++ b/drivers/staging/tidspbridge/core/dsp-clock.c
@@ -21,7 +21,7 @@ 
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 #include <plat/dmtimer.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
 #include <dspbridge/dbdefs.h>
diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index f9609ce..7bf55c4 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -16,7 +16,7 @@ 
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <plat/dsp.h>
+#include <linux/platform_data/dsp-omap.h>
 
 #include <linux/types.h>
 /*  ----------------------------------- Host OS */
diff --git a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
index 16a4aaf..55675b7 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
@@ -19,7 +19,7 @@ 
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 
-#include <plat/dsp.h>
+#include <linux/platform_data/dsp-omap.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
 #include <dspbridge/dbdefs.h>
diff --git a/drivers/staging/tidspbridge/core/tiomap_io.c b/drivers/staging/tidspbridge/core/tiomap_io.c
index 7fda10c..f53ed98 100644
--- a/drivers/staging/tidspbridge/core/tiomap_io.c
+++ b/drivers/staging/tidspbridge/core/tiomap_io.c
@@ -16,7 +16,7 @@ 
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <plat/dsp.h>
+#include <linux/platform_data/dsp-omap.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
 #include <dspbridge/dbdefs.h>
diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c
index 3cac014..49c9b66 100644
--- a/drivers/staging/tidspbridge/rmgr/drv_interface.c
+++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c
@@ -16,7 +16,7 @@ 
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <plat/dsp.h>
+#include <linux/platform_data/dsp-omap.h>
 
 #include <linux/types.h>
 #include <linux/platform_device.h>
diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c
index e3880c4..b739600 100644
--- a/drivers/video/omap/lcd_mipid.c
+++ b/drivers/video/omap/lcd_mipid.c
@@ -25,7 +25,7 @@ 
 #include <linux/spi/spi.h>
 #include <linux/module.h>
 
-#include <plat/lcd_mipid.h>
+#include <linux/platform_data/lcd-mipid.h>
 
 #include "omapfb.h"
 
diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/include/linux/platform_data/dsp-mcbsp.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/mcbsp.h
rename to include/linux/platform_data/dsp-mcbsp.h
diff --git a/arch/arm/plat-omap/include/plat/dsp.h b/include/linux/platform_data/dsp-omap.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/dsp.h
rename to include/linux/platform_data/dsp-omap.h
diff --git a/arch/arm/plat-omap/include/plat/keypad.h b/include/linux/platform_data/keypad-omap.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/keypad.h
rename to include/linux/platform_data/keypad-omap.h
diff --git a/arch/arm/plat-omap/include/plat/lcd_mipid.h b/include/linux/platform_data/lcd-mipid.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/lcd_mipid.h
rename to include/linux/platform_data/lcd-mipid.h
diff --git a/arch/arm/plat-omap/include/plat/nand.h b/include/linux/platform_data/mtd-nand-omap2.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/nand.h
rename to include/linux/platform_data/mtd-nand-omap2.h
diff --git a/arch/arm/plat-omap/include/plat/onenand.h b/include/linux/platform_data/mtd-onenand-omap2.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/onenand.h
rename to include/linux/platform_data/mtd-onenand-omap2.h
diff --git a/arch/arm/plat-omap/include/plat/remoteproc.h b/include/linux/platform_data/remoteproc-omap.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/remoteproc.h
rename to include/linux/platform_data/remoteproc-omap.h
diff --git a/arch/arm/plat-omap/include/plat/voltage.h b/include/linux/platform_data/smartreflex-omap.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/voltage.h
rename to include/linux/platform_data/smartreflex-omap.h
diff --git a/arch/arm/plat-omap/include/plat/mcspi.h b/include/linux/platform_data/spi-omap2-mcspi.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/mcspi.h
rename to include/linux/platform_data/spi-omap2-mcspi.h
diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
index 3101e62..e376f94 100644
--- a/include/linux/power/smartreflex.h
+++ b/include/linux/power/smartreflex.h
@@ -23,7 +23,7 @@ 
 #include <linux/types.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
-#include <plat/voltage.h>
+#include <linux/platform_data/smartreflex-omap.h>
 
 /*
  * Different Smartreflex IPs version. The v1 is the 65nm version used in
diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c
index 009533a..e815c4a 100644
--- a/sound/soc/omap/am3517evm.c
+++ b/sound/soc/omap/am3517evm.c
@@ -27,7 +27,7 @@ 
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 #include <mach/gpio.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index 7d4fa8e..293e61a 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -33,7 +33,7 @@ 
 #include <asm/mach-types.h>
 
 #include <plat/board-ams-delta.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/igep0020.c b/sound/soc/omap/igep0020.c
index e835781..e6393b0 100644
--- a/sound/soc/omap/igep0020.c
+++ b/sound/soc/omap/igep0020.c
@@ -29,7 +29,7 @@ 
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 #include <mach/gpio.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index d33c48b..4bc029d 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -25,7 +25,7 @@ 
 #include <linux/io.h>
 #include <linux/slab.h>
 
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 
 #include "mcbsp.h"
 
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index abac4b6..232357b 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -32,7 +32,7 @@ 
 #include <mach/hardware.h>
 #include <linux/gpio.h>
 #include <linux/module.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index acdd3ef..deeda47 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -33,7 +33,7 @@ 
 #include <sound/soc.h>
 
 #include <plat/dma.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 #include "mcbsp.h"
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c
index 2830dfd..89d115c 100644
--- a/sound/soc/omap/omap3beagle.c
+++ b/sound/soc/omap/omap3beagle.c
@@ -29,7 +29,7 @@ 
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 #include <mach/gpio.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c
index 3d468c9..50d0b70 100644
--- a/sound/soc/omap/omap3evm.c
+++ b/sound/soc/omap/omap3evm.c
@@ -27,7 +27,7 @@ 
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 #include <mach/gpio.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index 4c3a097..68c4e16 100644
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -31,7 +31,7 @@ 
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c
index b1a9d64..27b9a05 100644
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/omap/osk5912.c
@@ -31,7 +31,7 @@ 
 #include <mach/hardware.h>
 #include <linux/gpio.h>
 #include <linux/module.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c
index 6ac3e0c..080c984 100644
--- a/sound/soc/omap/overo.c
+++ b/sound/soc/omap/overo.c
@@ -29,7 +29,7 @@ 
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 #include <mach/gpio.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 2712dd2..5b21bc4 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -31,7 +31,7 @@ 
 #include <sound/jack.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 #include "../codecs/tpa6130a2.h"
 
 #include <asm/mach-types.h>
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c
index 0e28322..33f4ac2 100644
--- a/sound/soc/omap/sdp3430.c
+++ b/sound/soc/omap/sdp3430.c
@@ -33,7 +33,7 @@ 
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 #include <mach/gpio.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 
 /* Register descriptions for twl4030 codec part */
 #include <linux/mfd/twl4030-audio.h>
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c
index 920e0d9..558364f 100644
--- a/sound/soc/omap/zoom2.c
+++ b/sound/soc/omap/zoom2.c
@@ -29,7 +29,7 @@ 
 #include <mach/hardware.h>
 #include <mach/gpio.h>
 #include <mach/board-zoom.h>
-#include <plat/mcbsp.h>
+#include <linux/platform_data/dsp-mcbsp.h>
 
 /* Register descriptions for twl4030 codec part */
 #include <linux/mfd/twl4030-audio.h>