* [PATCH 00/16] ARM: big platform data header rename
[not found] <1347368245-30989-1-git-send-email-arnd@arndb.de>
@ 2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
2012-09-11 13:02 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
0 siblings, 2 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 12:59 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, netdev, openezx-devel,
spear-devel, davinci-linux-open-source, linux-arm-msm,
linux-omap, linux-samsung-soc, linux-tegra
As we discussed at the ARM mini summit in San Diego, we are
going to move all platform specific header files that are used
in drivers out of the mach-* directories, at least for those
platforms that we want to have in a multiplatform kernel.
A big step in this direction is to move all the platform_data
definitions into include/linux/platform_data/. This takes
care of about a third of the header files in question and
should be relatively uncontroversial.
I changed the file names after the rename to be
include/linux/${subsystem}-${driver}.h where possible, to
have a more consistent naming there.
I would like to merge the series through the arm-soc tree
as an early branch so other branches can be based on top
or merge this branch into the other one to avoid conflicts.
Platform maintainers: please provide ACKs so I can take
it into the for-next branch as a stable sub-branch.
Driver maintainers: There should be nothing controversial
here, just a heads-up so you know that some one-line changes
are coming through the arm-soc tree that might cause an
occasional merge conflict. I've put a lot of people on
bcc in this mail so they know what the individual ones are
about. If you have specific comments, please reply on the
patches you are Cc'd on.
Arnd
Arnd Bergmann (16):
ARM: at91: move platform_data definitions
ARM: davinci: move platform_data definitions
ARM: ep93xx: move platform_data definitions
ARM: imx: move platform_data definitions
ARM: msm: move platform_data definitions
ARM: netx: move platform_data definitions
ARM: pxa: move platform_data definitions
ARM: sa1100: move platform_data definitions
ARM: tegra: move platform_data definitions
ARM: vt8500: move platform_data definitions
ARM: w90x900: move platform_data definitions
ARM: nomadik: move platform_data definitions
ARM: omap: move platform_data definitions
ARM: orion: move platform_data definitions
ARM: samsung: move platform_data definitions
ARM: spear: move platform_data definitions
Documentation/spi/ep93xx_spi | 2 +-
arch/arm/mach-at91/at91sam9g45_devices.c | 2 +-
arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
arch/arm/mach-at91/include/mach/at_hdmac.h | 61 -------
arch/arm/mach-at91/include/mach/atmel-mci.h | 2 +-
arch/arm/mach-davinci/aemif.c | 2 +-
arch/arm/mach-davinci/board-da830-evm.c | 8 +-
arch/arm/mach-davinci/board-da850-evm.c | 6 +-
arch/arm/mach-davinci/board-dm355-evm.c | 8 +-
arch/arm/mach-davinci/board-dm355-leopard.c | 8 +-
arch/arm/mach-davinci/board-dm365-evm.c | 8 +-
arch/arm/mach-davinci/board-dm644x-evm.c | 10 +-
arch/arm/mach-davinci/board-dm646x-evm.c | 6 +-
arch/arm/mach-davinci/board-mityomapl138.c | 4 +-
arch/arm/mach-davinci/board-neuros-osd2.c | 8 +-
arch/arm/mach-davinci/board-sffsdr.c | 4 +-
arch/arm/mach-davinci/davinci.h | 4 +-
arch/arm/mach-davinci/devices.c | 4 +-
arch/arm/mach-davinci/dm355.c | 4 +-
arch/arm/mach-davinci/dm365.c | 6 +-
arch/arm/mach-davinci/dm644x.c | 2 +-
arch/arm/mach-davinci/dm646x.c | 2 +-
arch/arm/mach-davinci/include/mach/aemif.h | 36 ----
arch/arm/mach-davinci/include/mach/asp.h | 137 ---------------
arch/arm/mach-davinci/include/mach/da8xx.h | 10 +-
arch/arm/mach-davinci/include/mach/i2c.h | 26 ---
arch/arm/mach-davinci/include/mach/keyscan.h | 42 -----
arch/arm/mach-davinci/include/mach/mmc.h | 39 -----
arch/arm/mach-davinci/include/mach/nand.h | 90 ----------
arch/arm/mach-davinci/include/mach/spi.h | 89 ----------
arch/arm/mach-davinci/include/mach/tnetv107x.h | 4 +-
arch/arm/mach-davinci/include/mach/usb.h | 59 -------
arch/arm/mach-davinci/usb.c | 2 +-
arch/arm/mach-dove/common.c | 2 +-
arch/arm/mach-ep93xx/core.c | 6 +-
arch/arm/mach-ep93xx/dma.c | 2 +-
arch/arm/mach-ep93xx/edb93xx.c | 4 +-
arch/arm/mach-ep93xx/include/mach/dma.h | 93 -----------
arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h | 35 ----
arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h | 29 ----
arch/arm/mach-ep93xx/include/mach/fb.h | 56 -------
arch/arm/mach-ep93xx/simone.c | 2 +-
arch/arm/mach-ep93xx/snappercl15.c | 2 +-
arch/arm/mach-ep93xx/vision_ep9307.c | 4 +-
arch/arm/mach-exynos/dev-audio.c | 2 +-
arch/arm/mach-exynos/dev-ohci.c | 2 +-
arch/arm/mach-exynos/include/mach/ohci.h | 21 ---
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-imx/ehci-imx25.c | 2 +-
arch/arm/mach-imx/ehci-imx27.c | 2 +-
arch/arm/mach-imx/ehci-imx31.c | 2 +-
arch/arm/mach-imx/ehci-imx35.c | 2 +-
arch/arm/mach-imx/ehci-imx5.c | 2 +-
arch/arm/mach-imx/mach-mx31moboard.c | 2 +-
arch/arm/mach-imx/mx1-camera-fiq-ksym.c | 2 +-
arch/arm/mach-kirkwood/board-dreamplug.c | 2 +-
arch/arm/mach-kirkwood/board-goflexnet.c | 2 +-
arch/arm/mach-kirkwood/common.c | 10 +-
arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 +-
arch/arm/mach-kirkwood/dockstar-setup.c | 2 +-
arch/arm/mach-kirkwood/guruplug-setup.c | 2 +-
arch/arm/mach-kirkwood/include/mach/leds-netxbig.h | 55 ------
arch/arm/mach-kirkwood/include/mach/leds-ns2.h | 26 ---
arch/arm/mach-kirkwood/netspace_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/netxbig_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/openrd-setup.c | 2 +-
arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +-
arch/arm/mach-kirkwood/sheevaplug-setup.c | 2 +-
arch/arm/mach-mmp/aspenite.c | 2 +-
arch/arm/mach-mmp/include/mach/mmp2.h | 2 +-
arch/arm/mach-mmp/include/mach/pxa168.h | 4 +-
arch/arm/mach-mmp/include/mach/pxa910.h | 2 +-
arch/arm/mach-mmp/include/mach/sram.h | 35 ----
arch/arm/mach-mmp/sram.c | 2 +-
arch/arm/mach-mmp/teton_bga.c | 2 +-
arch/arm/mach-msm/board-qsd8x50.c | 2 +-
arch/arm/mach-msm/board-trout-mmc.c | 2 +-
arch/arm/mach-msm/board-trout-panel.c | 2 +-
arch/arm/mach-msm/devices-msm7x00.c | 2 +-
arch/arm/mach-msm/devices-msm7x30.c | 2 +-
arch/arm/mach-msm/devices-qsd8x50.c | 2 +-
arch/arm/mach-msm/include/mach/board.h | 2 +-
arch/arm/mach-msm/include/mach/mmc.h | 30 ----
arch/arm/mach-msm/include/mach/msm_fb.h | 147 ----------------
arch/arm/mach-mv78xx0/common.c | 4 +-
arch/arm/mach-netx/include/mach/eth.h | 27 ---
arch/arm/mach-netx/nxdb500.c | 2 +-
arch/arm/mach-netx/nxdkn.c | 2 +-
arch/arm/mach-netx/nxeb500hmi.c | 2 +-
arch/arm/mach-nomadik/board-nhk8815.c | 2 +-
arch/arm/mach-nomadik/include/mach/nand.h | 16 --
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/mach-orion5x/common.c | 4 +-
arch/arm/mach-orion5x/db88f5281-setup.c | 2 +-
arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 +-
arch/arm/mach-pxa/am200epd.c | 2 +-
arch/arm/mach-pxa/am300epd.c | 2 +-
arch/arm/mach-pxa/balloon3.c | 8 +-
arch/arm/mach-pxa/cm-x270.c | 4 +-
arch/arm/mach-pxa/cm-x2xx.c | 2 +-
arch/arm/mach-pxa/cm-x300.c | 10 +-
arch/arm/mach-pxa/colibri-evalboard.c | 4 +-
arch/arm/mach-pxa/colibri-pxa270-income.c | 6 +-
arch/arm/mach-pxa/colibri-pxa300.c | 4 +-
arch/arm/mach-pxa/colibri-pxa320.c | 4 +-
arch/arm/mach-pxa/colibri-pxa3xx.c | 6 +-
arch/arm/mach-pxa/corgi.c | 4 +-
arch/arm/mach-pxa/csb726.c | 4 +-
arch/arm/mach-pxa/devices.c | 16 +-
arch/arm/mach-pxa/em-x270.c | 10 +-
arch/arm/mach-pxa/eseries.c | 4 +-
arch/arm/mach-pxa/ezx.c | 8 +-
arch/arm/mach-pxa/gumstix.c | 2 +-
arch/arm/mach-pxa/hx4700.c | 2 +-
arch/arm/mach-pxa/idp.c | 4 +-
arch/arm/mach-pxa/include/mach/arcom-pcmcia.h | 11 --
arch/arm/mach-pxa/include/mach/camera.h | 44 -----
arch/arm/mach-pxa/include/mach/irda.h | 25 ---
arch/arm/mach-pxa/include/mach/mmc.h | 28 ----
arch/arm/mach-pxa/include/mach/ohci.h | 36 ----
arch/arm/mach-pxa/include/mach/palmasoc.h | 8 -
arch/arm/mach-pxa/include/mach/pata_pxa.h | 33 ----
arch/arm/mach-pxa/include/mach/pxa3xx-u2d.h | 35 ----
arch/arm/mach-pxa/include/mach/pxa930_rotary.h | 20 ---
arch/arm/mach-pxa/include/mach/pxa930_trkball.h | 10 --
arch/arm/mach-pxa/include/mach/pxafb.h | 175 --------------------
arch/arm/mach-pxa/littleton.c | 8 +-
arch/arm/mach-pxa/lpd270.c | 8 +-
arch/arm/mach-pxa/lubbock.c | 6 +-
arch/arm/mach-pxa/magician.c | 8 +-
arch/arm/mach-pxa/mainstone.c | 10 +-
arch/arm/mach-pxa/mioa701.c | 8 +-
arch/arm/mach-pxa/mxm8x10.c | 8 +-
arch/arm/mach-pxa/palm27x.c | 8 +-
arch/arm/mach-pxa/palmld.c | 10 +-
arch/arm/mach-pxa/palmt5.c | 10 +-
arch/arm/mach-pxa/palmtc.c | 6 +-
arch/arm/mach-pxa/palmte2.c | 8 +-
arch/arm/mach-pxa/palmtreo.c | 14 +-
arch/arm/mach-pxa/palmtx.c | 10 +-
arch/arm/mach-pxa/palmz72.c | 12 +-
arch/arm/mach-pxa/pcm990-baseboard.c | 8 +-
arch/arm/mach-pxa/poodle.c | 6 +-
arch/arm/mach-pxa/pxa27x.c | 2 +-
arch/arm/mach-pxa/pxa2xx.c | 2 +-
arch/arm/mach-pxa/pxa3xx-ulpi.c | 2 +-
arch/arm/mach-pxa/pxa3xx.c | 2 +-
arch/arm/mach-pxa/raumfeld.c | 8 +-
arch/arm/mach-pxa/saar.c | 2 +-
arch/arm/mach-pxa/spitz.c | 8 +-
arch/arm/mach-pxa/stargate2.c | 2 +-
arch/arm/mach-pxa/tavorevb.c | 4 +-
arch/arm/mach-pxa/tosa.c | 4 +-
arch/arm/mach-pxa/trizeps4.c | 8 +-
arch/arm/mach-pxa/viper.c | 4 +-
arch/arm/mach-pxa/vpac270.c | 8 +-
arch/arm/mach-pxa/z2.c | 6 +-
arch/arm/mach-pxa/zeus.c | 8 +-
arch/arm/mach-pxa/zylonite.c | 10 +-
arch/arm/mach-s3c24xx/common-smdk.c | 4 +-
arch/arm/mach-s3c24xx/include/mach/leds-gpio.h | 28 ----
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/mach-sa1100/assabet.c | 2 +-
arch/arm/mach-sa1100/cerf.c | 2 +-
arch/arm/mach-sa1100/collie.c | 2 +-
arch/arm/mach-sa1100/include/mach/mcp.h | 22 ---
arch/arm/mach-sa1100/lart.c | 2 +-
arch/arm/mach-sa1100/shannon.c | 2 +-
arch/arm/mach-sa1100/simpad.c | 2 +-
arch/arm/mach-tegra/board-harmony.c | 4 +-
arch/arm/mach-tegra/board-paz00.c | 2 +-
arch/arm/mach-tegra/board-trimslice.c | 2 +-
arch/arm/mach-tegra/include/mach/kbc.h | 62 -------
arch/arm/mach-tegra/include/mach/sdhci.h | 30 ----
.../mach-tegra/include/mach/tegra_wm8903_pdata.h | 23 ---
arch/arm/mach-u300/core.c | 2 +-
arch/arm/mach-u300/include/mach/gpio-u300.h | 37 -----
arch/arm/mach-ux500/board-mop500.c | 2 +-
arch/arm/mach-ux500/cpu-db8500.c | 2 +-
arch/arm/mach-ux500/devices-common.h | 2 +-
arch/arm/mach-ux500/include/mach/crypto-ux500.h | 22 ---
arch/arm/mach-ux500/include/mach/usb.h | 25 ---
arch/arm/mach-ux500/usb.c | 2 +-
arch/arm/mach-vt8500/devices.c | 2 +-
arch/arm/mach-vt8500/include/mach/vt8500fb.h | 31 ----
arch/arm/mach-w90x900/dev.c | 6 +-
arch/arm/mach-w90x900/include/mach/fb.h | 83 ----------
arch/arm/mach-w90x900/include/mach/i2c.h | 9 -
arch/arm/mach-w90x900/include/mach/nuc900_spi.h | 35 ----
.../arm/mach-w90x900/include/mach/w90p910_keypad.h | 15 --
arch/arm/mach-w90x900/mach-nuc950evb.c | 2 +-
.../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 2 +-
arch/arm/plat-mxc/include/mach/devices-common.h | 32 ++--
arch/arm/plat-mxc/include/mach/dma.h | 67 --------
arch/arm/plat-mxc/include/mach/esdhc.h | 43 -----
arch/arm/plat-mxc/include/mach/i2c.h | 21 ---
arch/arm/plat-mxc/include/mach/imx-uart.h | 35 ----
arch/arm/plat-mxc/include/mach/imxfb.h | 84 ----------
arch/arm/plat-mxc/include/mach/mmc.h | 39 -----
arch/arm/plat-mxc/include/mach/mx1_camera.h | 35 ----
arch/arm/plat-mxc/include/mach/mx21-usbhost.h | 38 -----
arch/arm/plat-mxc/include/mach/mx2_cam.h | 46 -----
arch/arm/plat-mxc/include/mach/mx3_camera.h | 48 ------
arch/arm/plat-mxc/include/mach/mx3fb.h | 53 ------
arch/arm/plat-mxc/include/mach/mxc_ehci.h | 59 -------
arch/arm/plat-mxc/include/mach/mxc_nand.h | 32 ----
arch/arm/plat-mxc/include/mach/sdma.h | 59 -------
arch/arm/plat-mxc/include/mach/spi.h | 27 ---
arch/arm/plat-mxc/include/mach/ssi.h | 21 ---
arch/arm/plat-mxc/include/mach/usb.h | 23 ---
arch/arm/plat-mxc/ssi-fiq-ksym.c | 2 +-
arch/arm/plat-nomadik/include/plat/ske.h | 50 ------
arch/arm/plat-omap/common.c | 2 +-
arch/arm/plat-omap/include/plat/dsp.h | 34 ----
arch/arm/plat-omap/include/plat/keypad.h | 52 ------
arch/arm/plat-omap/include/plat/lcd_mipid.h | 29 ----
arch/arm/plat-omap/include/plat/mcbsp.h | 62 -------
arch/arm/plat-omap/include/plat/mcspi.h | 23 ---
arch/arm/plat-omap/include/plat/nand.h | 44 -----
arch/arm/plat-omap/include/plat/onenand.h | 53 ------
arch/arm/plat-omap/include/plat/remoteproc.h | 57 -------
arch/arm/plat-omap/include/plat/voltage.h | 39 -----
arch/arm/plat-orion/common.c | 4 +-
arch/arm/plat-orion/include/plat/audio.h | 7 -
arch/arm/plat-orion/include/plat/ehci-orion.h | 26 ---
arch/arm/plat-orion/include/plat/mv_xor.h | 24 ---
arch/arm/plat-orion/include/plat/mvsdio.h | 20 ---
arch/arm/plat-orion/include/plat/orion_nand.h | 26 ---
arch/arm/plat-pxa/include/plat/pxa27x_keypad.h | 73 --------
arch/arm/plat-pxa/include/plat/pxa3xx_nand.h | 79 ---------
arch/arm/plat-samsung/devs.c | 20 +--
arch/arm/plat-samsung/include/plat/ata.h | 36 ----
arch/arm/plat-samsung/include/plat/audio-simtec.h | 34 ----
arch/arm/plat-samsung/include/plat/audio.h | 59 -------
arch/arm/plat-samsung/include/plat/ehci.h | 21 ---
arch/arm/plat-samsung/include/plat/hwmon.h | 51 ------
arch/arm/plat-samsung/include/plat/iic.h | 77 ---------
arch/arm/plat-samsung/include/plat/mci.h | 52 ------
arch/arm/plat-samsung/include/plat/mipi_csis.h | 43 -----
arch/arm/plat-samsung/include/plat/nand.h | 67 --------
arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 68 --------
arch/arm/plat-samsung/include/plat/ts.h | 25 ---
arch/arm/plat-samsung/include/plat/udc.h | 44 -----
arch/arm/plat-samsung/include/plat/usb-control.h | 43 -----
arch/arm/plat-spear/include/plat/keyboard.h | 164 ------------------
drivers/ata/pata_ep93xx.c | 2 +-
drivers/ata/pata_pxa.c | 2 +-
drivers/ata/pata_samsung_cf.c | 2 +-
drivers/crypto/ux500/cryp/cryp_core.c | 2 +-
drivers/crypto/ux500/hash/hash_core.c | 2 +-
drivers/dma/at_hdmac_regs.h | 2 +-
drivers/dma/ep93xx_dma.c | 2 +-
drivers/dma/imx-dma.c | 2 +-
drivers/dma/imx-sdma.c | 4 +-
drivers/dma/mmp_tdma.c | 2 +-
drivers/dma/mv_xor.c | 2 +-
drivers/hwmon/s3c-hwmon.c | 2 +-
drivers/i2c/busses/i2c-davinci.c | 2 +-
drivers/i2c/busses/i2c-imx.c | 2 +-
drivers/i2c/busses/i2c-nuc900.c | 2 +-
drivers/i2c/busses/i2c-s3c2410.c | 2 +-
drivers/input/keyboard/davinci_keyscan.c | 2 +-
drivers/input/keyboard/ep93xx_keypad.c | 2 +-
drivers/input/keyboard/nomadik-ske-keypad.c | 2 +-
drivers/input/keyboard/omap-keypad.c | 2 +-
drivers/input/keyboard/pxa27x_keypad.c | 2 +-
drivers/input/keyboard/pxa930_rotary.c | 2 +-
drivers/input/keyboard/spear-keyboard.c | 2 +-
drivers/input/keyboard/tegra-kbc.c | 2 +-
drivers/input/keyboard/w90p910_keypad.c | 2 +-
drivers/input/mouse/pxa930_trkball.c | 2 +-
drivers/input/touchscreen/s3c2410_ts.c | 2 +-
drivers/leds/leds-netxbig.c | 2 +-
drivers/leds/leds-ns2.c | 2 +-
drivers/leds/leds-s3c24xx.c | 2 +-
drivers/media/video/davinci/vpbe_venc.c | 2 +-
drivers/media/video/mx1_camera.c | 2 +-
drivers/media/video/mx2_camera.c | 2 +-
drivers/media/video/mx3_camera.c | 4 +-
drivers/media/video/pxa_camera.c | 2 +-
drivers/media/video/s5p-fimc/mipi-csis.c | 2 +-
drivers/mfd/mcp-sa11x0.c | 2 +-
drivers/mmc/host/davinci_mmc.c | 2 +-
drivers/mmc/host/msm_sdcc.c | 2 +-
drivers/mmc/host/mvsdio.c | 2 +-
drivers/mmc/host/mxcmmc.c | 4 +-
drivers/mmc/host/pxamci.c | 2 +-
drivers/mmc/host/s3cmci.c | 2 +-
drivers/mmc/host/sdhci-esdhc-imx.c | 2 +-
drivers/mmc/host/sdhci-tegra.c | 2 +-
drivers/mtd/nand/davinci_nand.c | 4 +-
drivers/mtd/nand/mxc_nand.c | 2 +-
drivers/mtd/nand/nomadik_nand.c | 2 +-
drivers/mtd/nand/omap2.c | 2 +-
drivers/mtd/nand/orion_nand.c | 2 +-
drivers/mtd/nand/pxa3xx_nand.c | 2 +-
drivers/mtd/nand/s3c2410.c | 2 +-
drivers/mtd/onenand/omap2.c | 2 +-
drivers/net/ethernet/netx-eth.c | 2 +-
drivers/net/irda/pxaficp_ir.c | 2 +-
drivers/pcmcia/pxa2xx_viper.c | 2 +-
drivers/pinctrl/pinctrl-coh901.c | 2 +-
drivers/remoteproc/omap_remoteproc.c | 2 +-
drivers/spi/spi-davinci.c | 2 +-
drivers/spi/spi-ep93xx.c | 4 +-
drivers/spi/spi-imx.c | 2 +-
drivers/spi/spi-nuc900.c | 2 +-
drivers/spi/spi-omap2-mcspi.c | 2 +-
drivers/spi/spi-s3c64xx.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/tty/serial/imx.c | 2 +-
drivers/usb/gadget/imx_udc.c | 2 +-
drivers/usb/gadget/s3c2410_udc.c | 2 +-
drivers/usb/host/ehci-mxc.c | 2 +-
drivers/usb/host/ehci-orion.c | 2 +-
drivers/usb/host/ehci-s5p.c | 2 +-
drivers/usb/host/imx21-hcd.h | 2 +-
drivers/usb/host/ohci-da8xx.c | 2 +-
drivers/usb/host/ohci-exynos.c | 2 +-
drivers/usb/host/ohci-pxa27x.c | 4 +-
drivers/usb/host/ohci-s3c2410.c | 2 +-
drivers/usb/musb/da8xx.c | 2 +-
drivers/usb/musb/ux500_dma.c | 2 +-
drivers/video/ep93xx-fb.c | 2 +-
drivers/video/imxfb.c | 2 +-
drivers/video/msm/mddi.c | 2 +-
drivers/video/msm/mddi_client_dummy.c | 2 +-
drivers/video/msm/mddi_client_nt35399.c | 2 +-
drivers/video/msm/mddi_client_toshiba.c | 2 +-
drivers/video/msm/mdp.c | 2 +-
drivers/video/msm/mdp_hw.h | 2 +-
drivers/video/msm/mdp_ppp.c | 2 +-
drivers/video/msm/msm_fb.c | 2 +-
drivers/video/mx3fb.c | 4 +-
drivers/video/nuc900fb.c | 2 +-
drivers/video/nuc900fb.h | 2 +-
drivers/video/omap/lcd_mipid.c | 2 +-
drivers/video/pxafb.c | 2 +-
drivers/video/vt8500lcdfb.c | 2 +-
drivers/video/wm8505fb.c | 2 +-
include/linux/platform_data/asoc-davinci-evm.h | 137 +++++++++++++++
include/linux/platform_data/asoc-imx-ssi.h | 21 +++
include/linux/platform_data/asoc-kirkwood.h | 7 +
include/linux/platform_data/asoc-palm27x.h | 8 +
include/linux/platform_data/asoc-s3c.h | 59 +++++++
include/linux/platform_data/asoc-s3c24xx_simtec.h | 34 ++++
include/linux/platform_data/asoc-tegra_wm8903.h | 23 +++
include/linux/platform_data/ata-pxa.h | 33 ++++
include/linux/platform_data/ata-samsung_cf.h | 36 ++++
include/linux/platform_data/atmel-aes.h | 2 +-
include/linux/platform_data/camera-mx1.h | 35 ++++
include/linux/platform_data/camera-mx2.h | 46 +++++
include/linux/platform_data/camera-mx3.h | 48 ++++++
include/linux/platform_data/camera-pxa.h | 44 +++++
include/linux/platform_data/crypto-ux500.h | 22 +++
include/linux/platform_data/dma-atmel.h | 61 +++++++
include/linux/platform_data/dma-ep93xx.h | 93 +++++++++++
include/linux/platform_data/dma-imx-sdma.h | 59 +++++++
include/linux/platform_data/dma-imx.h | 67 ++++++++
include/linux/platform_data/dma-mmp_tdma.h | 35 ++++
include/linux/platform_data/dma-mv_xor.h | 24 +++
include/linux/platform_data/dsp-mcbsp.h | 62 +++++++
include/linux/platform_data/dsp-omap.h | 34 ++++
include/linux/platform_data/eth-netx.h | 27 +++
include/linux/platform_data/hwmon-s3c.h | 51 ++++++
include/linux/platform_data/i2c-davinci.h | 26 +++
include/linux/platform_data/i2c-imx.h | 21 +++
include/linux/platform_data/i2c-nuc900.h | 9 +
include/linux/platform_data/i2c-s3c2410.h | 77 +++++++++
include/linux/platform_data/irda-pxaficp.h | 25 +++
.../linux/platform_data/keyboard-pxa930_rotary.h | 20 +++
include/linux/platform_data/keyboard-spear.h | 164 ++++++++++++++++++
include/linux/platform_data/keyboard-tegra-kbc.h | 62 +++++++
include/linux/platform_data/keypad-ep93xx.h | 35 ++++
include/linux/platform_data/keypad-nomadik-ske.h | 50 ++++++
include/linux/platform_data/keypad-omap.h | 52 ++++++
include/linux/platform_data/keypad-pxa27x.h | 73 ++++++++
include/linux/platform_data/keypad-w90p910.h | 15 ++
include/linux/platform_data/keyscan-davinci.h | 42 +++++
include/linux/platform_data/lcd-mipid.h | 29 ++++
.../linux/platform_data/leds-kirkwood-netxbig.h | 55 ++++++
include/linux/platform_data/leds-kirkwood-ns2.h | 26 +++
include/linux/platform_data/leds-s3c24xx.h | 28 ++++
include/linux/platform_data/mfd-mcp-sa11x0.h | 22 +++
include/linux/platform_data/mipi-csis.h | 43 +++++
include/linux/platform_data/mmc-davinci.h | 39 +++++
include/linux/platform_data/mmc-esdhc-imx.h | 43 +++++
include/linux/platform_data/mmc-msm_sdcc.h | 30 ++++
include/linux/platform_data/mmc-mvsdio.h | 20 +++
include/linux/platform_data/mmc-mxcmmc.h | 39 +++++
include/linux/platform_data/mmc-pxamci.h | 28 ++++
include/linux/platform_data/mmc-s3cmci.h | 52 ++++++
include/linux/platform_data/mmc-sdhci-tegra.h | 30 ++++
include/linux/platform_data/mouse-pxa930_trkball.h | 10 ++
include/linux/platform_data/mtd-davinci-aemif.h | 36 ++++
include/linux/platform_data/mtd-davinci.h | 90 ++++++++++
include/linux/platform_data/mtd-mxc_nand.h | 32 ++++
include/linux/platform_data/mtd-nand-omap2.h | 44 +++++
include/linux/platform_data/mtd-nand-pxa3xx.h | 79 +++++++++
include/linux/platform_data/mtd-nand-s3c2410.h | 67 ++++++++
include/linux/platform_data/mtd-nomadik-nand.h | 16 ++
include/linux/platform_data/mtd-onenand-omap2.h | 53 ++++++
include/linux/platform_data/mtd-orion_nand.h | 26 +++
include/linux/platform_data/pcmcia-pxa2xx_viper.h | 11 ++
include/linux/platform_data/pinctrl-coh901.h | 37 +++++
include/linux/platform_data/remoteproc-omap.h | 57 +++++++
include/linux/platform_data/serial-imx.h | 35 ++++
include/linux/platform_data/smartreflex-omap.h | 39 +++++
include/linux/platform_data/spi-davinci.h | 89 ++++++++++
include/linux/platform_data/spi-ep93xx.h | 29 ++++
include/linux/platform_data/spi-imx.h | 27 +++
include/linux/platform_data/spi-nuc900.h | 35 ++++
include/linux/platform_data/spi-omap2-mcspi.h | 23 +++
include/linux/platform_data/spi-s3c64xx.h | 68 ++++++++
include/linux/platform_data/touchscreen-s3c2410.h | 25 +++
include/linux/platform_data/usb-davinci.h | 59 +++++++
include/linux/platform_data/usb-ehci-mxc.h | 59 +++++++
include/linux/platform_data/usb-ehci-orion.h | 26 +++
include/linux/platform_data/usb-ehci-s5p.h | 21 +++
include/linux/platform_data/usb-exynos.h | 21 +++
include/linux/platform_data/usb-imx_udc.h | 23 +++
include/linux/platform_data/usb-musb-ux500.h | 25 +++
include/linux/platform_data/usb-mx2.h | 38 +++++
include/linux/platform_data/usb-ohci-pxa27x.h | 36 ++++
include/linux/platform_data/usb-ohci-s3c2410.h | 43 +++++
include/linux/platform_data/usb-pxa3xx-ulpi.h | 35 ++++
include/linux/platform_data/usb-s3c2410_udc.h | 44 +++++
include/linux/platform_data/video-ep93xx.h | 56 +++++++
include/linux/platform_data/video-imxfb.h | 84 ++++++++++
include/linux/platform_data/video-msm_fb.h | 147 ++++++++++++++++
include/linux/platform_data/video-mx3fb.h | 53 ++++++
include/linux/platform_data/video-nuc900fb.h | 83 ++++++++++
include/linux/platform_data/video-pxafb.h | 175 ++++++++++++++++++++
include/linux/platform_data/video-vt8500lcdfb.h | 31 ++++
include/linux/power/smartreflex.h | 2 +-
sound/soc/davinci/davinci-evm.c | 2 +-
sound/soc/davinci/davinci-i2s.c | 2 +-
sound/soc/davinci/davinci-mcasp.h | 2 +-
sound/soc/davinci/davinci-pcm.h | 2 +-
sound/soc/ep93xx/ep93xx-ac97.c | 2 +-
sound/soc/ep93xx/ep93xx-i2s.c | 2 +-
sound/soc/ep93xx/ep93xx-pcm.c | 2 +-
sound/soc/fsl/imx-pcm-dma.c | 2 +-
sound/soc/fsl/imx-pcm-fiq.c | 2 +-
sound/soc/fsl/imx-ssi.c | 2 +-
sound/soc/fsl/imx-ssi.h | 2 +-
sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
sound/soc/kirkwood/kirkwood-openrd.c | 2 +-
sound/soc/kirkwood/kirkwood-t5325.c | 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 +-
sound/soc/pxa/palm27x.c | 2 +-
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 +-
sound/soc/tegra/tegra_wm8903.c | 2 +-
587 files changed, 4882 insertions(+), 4882 deletions(-)
delete mode 100644 arch/arm/mach-at91/include/mach/at_hdmac.h
delete mode 100644 arch/arm/mach-davinci/include/mach/aemif.h
delete mode 100644 arch/arm/mach-davinci/include/mach/asp.h
delete mode 100644 arch/arm/mach-davinci/include/mach/i2c.h
delete mode 100644 arch/arm/mach-davinci/include/mach/keyscan.h
delete mode 100644 arch/arm/mach-davinci/include/mach/mmc.h
delete mode 100644 arch/arm/mach-davinci/include/mach/nand.h
delete mode 100644 arch/arm/mach-davinci/include/mach/spi.h
delete mode 100644 arch/arm/mach-davinci/include/mach/usb.h
delete mode 100644 arch/arm/mach-ep93xx/include/mach/dma.h
delete mode 100644 arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
delete mode 100644 arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h
delete mode 100644 arch/arm/mach-ep93xx/include/mach/fb.h
delete mode 100644 arch/arm/mach-exynos/include/mach/ohci.h
delete mode 100644 arch/arm/mach-kirkwood/include/mach/leds-netxbig.h
delete mode 100644 arch/arm/mach-kirkwood/include/mach/leds-ns2.h
delete mode 100644 arch/arm/mach-mmp/include/mach/sram.h
delete mode 100644 arch/arm/mach-msm/include/mach/mmc.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_fb.h
delete mode 100644 arch/arm/mach-netx/include/mach/eth.h
delete mode 100644 arch/arm/mach-nomadik/include/mach/nand.h
delete mode 100644 arch/arm/mach-pxa/include/mach/arcom-pcmcia.h
delete mode 100644 arch/arm/mach-pxa/include/mach/camera.h
delete mode 100644 arch/arm/mach-pxa/include/mach/irda.h
delete mode 100644 arch/arm/mach-pxa/include/mach/mmc.h
delete mode 100644 arch/arm/mach-pxa/include/mach/ohci.h
delete mode 100644 arch/arm/mach-pxa/include/mach/palmasoc.h
delete mode 100644 arch/arm/mach-pxa/include/mach/pata_pxa.h
delete mode 100644 arch/arm/mach-pxa/include/mach/pxa3xx-u2d.h
delete mode 100644 arch/arm/mach-pxa/include/mach/pxa930_rotary.h
delete mode 100644 arch/arm/mach-pxa/include/mach/pxa930_trkball.h
delete mode 100644 arch/arm/mach-pxa/include/mach/pxafb.h
delete mode 100644 arch/arm/mach-s3c24xx/include/mach/leds-gpio.h
delete mode 100644 arch/arm/mach-sa1100/include/mach/mcp.h
delete mode 100644 arch/arm/mach-tegra/include/mach/kbc.h
delete mode 100644 arch/arm/mach-tegra/include/mach/sdhci.h
delete mode 100644 arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
delete mode 100644 arch/arm/mach-u300/include/mach/gpio-u300.h
delete mode 100644 arch/arm/mach-ux500/include/mach/crypto-ux500.h
delete mode 100644 arch/arm/mach-ux500/include/mach/usb.h
delete mode 100644 arch/arm/mach-vt8500/include/mach/vt8500fb.h
delete mode 100644 arch/arm/mach-w90x900/include/mach/fb.h
delete mode 100644 arch/arm/mach-w90x900/include/mach/i2c.h
delete mode 100644 arch/arm/mach-w90x900/include/mach/nuc900_spi.h
delete mode 100644 arch/arm/mach-w90x900/include/mach/w90p910_keypad.h
delete mode 100644 arch/arm/plat-mxc/include/mach/dma.h
delete mode 100644 arch/arm/plat-mxc/include/mach/esdhc.h
delete mode 100644 arch/arm/plat-mxc/include/mach/i2c.h
delete mode 100644 arch/arm/plat-mxc/include/mach/imx-uart.h
delete mode 100644 arch/arm/plat-mxc/include/mach/imxfb.h
delete mode 100644 arch/arm/plat-mxc/include/mach/mmc.h
delete mode 100644 arch/arm/plat-mxc/include/mach/mx1_camera.h
delete mode 100644 arch/arm/plat-mxc/include/mach/mx21-usbhost.h
delete mode 100644 arch/arm/plat-mxc/include/mach/mx2_cam.h
delete mode 100644 arch/arm/plat-mxc/include/mach/mx3_camera.h
delete mode 100644 arch/arm/plat-mxc/include/mach/mx3fb.h
delete mode 100644 arch/arm/plat-mxc/include/mach/mxc_ehci.h
delete mode 100644 arch/arm/plat-mxc/include/mach/mxc_nand.h
delete mode 100644 arch/arm/plat-mxc/include/mach/sdma.h
delete mode 100644 arch/arm/plat-mxc/include/mach/spi.h
delete mode 100644 arch/arm/plat-mxc/include/mach/ssi.h
delete mode 100644 arch/arm/plat-mxc/include/mach/usb.h
delete mode 100644 arch/arm/plat-nomadik/include/plat/ske.h
delete mode 100644 arch/arm/plat-omap/include/plat/dsp.h
delete mode 100644 arch/arm/plat-omap/include/plat/keypad.h
delete mode 100644 arch/arm/plat-omap/include/plat/lcd_mipid.h
delete mode 100644 arch/arm/plat-omap/include/plat/mcbsp.h
delete mode 100644 arch/arm/plat-omap/include/plat/mcspi.h
delete mode 100644 arch/arm/plat-omap/include/plat/nand.h
delete mode 100644 arch/arm/plat-omap/include/plat/onenand.h
delete mode 100644 arch/arm/plat-omap/include/plat/remoteproc.h
delete mode 100644 arch/arm/plat-omap/include/plat/voltage.h
delete mode 100644 arch/arm/plat-orion/include/plat/audio.h
delete mode 100644 arch/arm/plat-orion/include/plat/ehci-orion.h
delete mode 100644 arch/arm/plat-orion/include/plat/mv_xor.h
delete mode 100644 arch/arm/plat-orion/include/plat/mvsdio.h
delete mode 100644 arch/arm/plat-orion/include/plat/orion_nand.h
delete mode 100644 arch/arm/plat-pxa/include/plat/pxa27x_keypad.h
delete mode 100644 arch/arm/plat-pxa/include/plat/pxa3xx_nand.h
delete mode 100644 arch/arm/plat-samsung/include/plat/ata.h
delete mode 100644 arch/arm/plat-samsung/include/plat/audio-simtec.h
delete mode 100644 arch/arm/plat-samsung/include/plat/audio.h
delete mode 100644 arch/arm/plat-samsung/include/plat/ehci.h
delete mode 100644 arch/arm/plat-samsung/include/plat/hwmon.h
delete mode 100644 arch/arm/plat-samsung/include/plat/iic.h
delete mode 100644 arch/arm/plat-samsung/include/plat/mci.h
delete mode 100644 arch/arm/plat-samsung/include/plat/mipi_csis.h
delete mode 100644 arch/arm/plat-samsung/include/plat/nand.h
delete mode 100644 arch/arm/plat-samsung/include/plat/s3c64xx-spi.h
delete mode 100644 arch/arm/plat-samsung/include/plat/ts.h
delete mode 100644 arch/arm/plat-samsung/include/plat/udc.h
delete mode 100644 arch/arm/plat-samsung/include/plat/usb-control.h
delete mode 100644 arch/arm/plat-spear/include/plat/keyboard.h
create mode 100644 include/linux/platform_data/asoc-davinci-evm.h
create mode 100644 include/linux/platform_data/asoc-imx-ssi.h
create mode 100644 include/linux/platform_data/asoc-kirkwood.h
create mode 100644 include/linux/platform_data/asoc-palm27x.h
create mode 100644 include/linux/platform_data/asoc-s3c.h
create mode 100644 include/linux/platform_data/asoc-s3c24xx_simtec.h
create mode 100644 include/linux/platform_data/asoc-tegra_wm8903.h
create mode 100644 include/linux/platform_data/ata-pxa.h
create mode 100644 include/linux/platform_data/ata-samsung_cf.h
create mode 100644 include/linux/platform_data/camera-mx1.h
create mode 100644 include/linux/platform_data/camera-mx2.h
create mode 100644 include/linux/platform_data/camera-mx3.h
create mode 100644 include/linux/platform_data/camera-pxa.h
create mode 100644 include/linux/platform_data/crypto-ux500.h
create mode 100644 include/linux/platform_data/dma-atmel.h
create mode 100644 include/linux/platform_data/dma-ep93xx.h
create mode 100644 include/linux/platform_data/dma-imx-sdma.h
create mode 100644 include/linux/platform_data/dma-imx.h
create mode 100644 include/linux/platform_data/dma-mmp_tdma.h
create mode 100644 include/linux/platform_data/dma-mv_xor.h
create mode 100644 include/linux/platform_data/dsp-mcbsp.h
create mode 100644 include/linux/platform_data/dsp-omap.h
create mode 100644 include/linux/platform_data/eth-netx.h
create mode 100644 include/linux/platform_data/hwmon-s3c.h
create mode 100644 include/linux/platform_data/i2c-davinci.h
create mode 100644 include/linux/platform_data/i2c-imx.h
create mode 100644 include/linux/platform_data/i2c-nuc900.h
create mode 100644 include/linux/platform_data/i2c-s3c2410.h
create mode 100644 include/linux/platform_data/irda-pxaficp.h
create mode 100644 include/linux/platform_data/keyboard-pxa930_rotary.h
create mode 100644 include/linux/platform_data/keyboard-spear.h
create mode 100644 include/linux/platform_data/keyboard-tegra-kbc.h
create mode 100644 include/linux/platform_data/keypad-ep93xx.h
create mode 100644 include/linux/platform_data/keypad-nomadik-ske.h
create mode 100644 include/linux/platform_data/keypad-omap.h
create mode 100644 include/linux/platform_data/keypad-pxa27x.h
create mode 100644 include/linux/platform_data/keypad-w90p910.h
create mode 100644 include/linux/platform_data/keyscan-davinci.h
create mode 100644 include/linux/platform_data/lcd-mipid.h
create mode 100644 include/linux/platform_data/leds-kirkwood-netxbig.h
create mode 100644 include/linux/platform_data/leds-kirkwood-ns2.h
create mode 100644 include/linux/platform_data/leds-s3c24xx.h
create mode 100644 include/linux/platform_data/mfd-mcp-sa11x0.h
create mode 100644 include/linux/platform_data/mipi-csis.h
create mode 100644 include/linux/platform_data/mmc-davinci.h
create mode 100644 include/linux/platform_data/mmc-esdhc-imx.h
create mode 100644 include/linux/platform_data/mmc-msm_sdcc.h
create mode 100644 include/linux/platform_data/mmc-mvsdio.h
create mode 100644 include/linux/platform_data/mmc-mxcmmc.h
create mode 100644 include/linux/platform_data/mmc-pxamci.h
create mode 100644 include/linux/platform_data/mmc-s3cmci.h
create mode 100644 include/linux/platform_data/mmc-sdhci-tegra.h
create mode 100644 include/linux/platform_data/mouse-pxa930_trkball.h
create mode 100644 include/linux/platform_data/mtd-davinci-aemif.h
create mode 100644 include/linux/platform_data/mtd-davinci.h
create mode 100644 include/linux/platform_data/mtd-mxc_nand.h
create mode 100644 include/linux/platform_data/mtd-nand-omap2.h
create mode 100644 include/linux/platform_data/mtd-nand-pxa3xx.h
create mode 100644 include/linux/platform_data/mtd-nand-s3c2410.h
create mode 100644 include/linux/platform_data/mtd-nomadik-nand.h
create mode 100644 include/linux/platform_data/mtd-onenand-omap2.h
create mode 100644 include/linux/platform_data/mtd-orion_nand.h
create mode 100644 include/linux/platform_data/pcmcia-pxa2xx_viper.h
create mode 100644 include/linux/platform_data/pinctrl-coh901.h
create mode 100644 include/linux/platform_data/remoteproc-omap.h
create mode 100644 include/linux/platform_data/serial-imx.h
create mode 100644 include/linux/platform_data/smartreflex-omap.h
create mode 100644 include/linux/platform_data/spi-davinci.h
create mode 100644 include/linux/platform_data/spi-ep93xx.h
create mode 100644 include/linux/platform_data/spi-imx.h
create mode 100644 include/linux/platform_data/spi-nuc900.h
create mode 100644 include/linux/platform_data/spi-omap2-mcspi.h
create mode 100644 include/linux/platform_data/spi-s3c64xx.h
create mode 100644 include/linux/platform_data/touchscreen-s3c2410.h
create mode 100644 include/linux/platform_data/usb-davinci.h
create mode 100644 include/linux/platform_data/usb-ehci-mxc.h
create mode 100644 include/linux/platform_data/usb-ehci-orion.h
create mode 100644 include/linux/platform_data/usb-ehci-s5p.h
create mode 100644 include/linux/platform_data/usb-exynos.h
create mode 100644 include/linux/platform_data/usb-imx_udc.h
create mode 100644 include/linux/platform_data/usb-musb-ux500.h
create mode 100644 include/linux/platform_data/usb-mx2.h
create mode 100644 include/linux/platform_data/usb-ohci-pxa27x.h
create mode 100644 include/linux/platform_data/usb-ohci-s3c2410.h
create mode 100644 include/linux/platform_data/usb-pxa3xx-ulpi.h
create mode 100644 include/linux/platform_data/usb-s3c2410_udc.h
create mode 100644 include/linux/platform_data/video-ep93xx.h
create mode 100644 include/linux/platform_data/video-imxfb.h
create mode 100644 include/linux/platform_data/video-msm_fb.h
create mode 100644 include/linux/platform_data/video-mx3fb.h
create mode 100644 include/linux/platform_data/video-nuc900fb.h
create mode 100644 include/linux/platform_data/video-pxafb.h
create mode 100644 include/linux/platform_data/video-vt8500lcdfb.h
Cc: netdev@vger.kernel.org
Cc: openezx-devel@lists.openezx.org
Cc: spear-devel@list.st.com
Cc: davinci-linux-open-source@linux.davincidsp.com
Cc: linux-arm-msm@vger.kernel.org
Cc: linux-omap@vger.kernel.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-tegra@vger.kernel.org
Bcc: "Ben Dooks" <ben-linux@fluff.org>
Bcc: "Benoît Cousson" <b-cousson@ti.com>
Bcc: "David S. Miller" <davem@davemloft.net>
Bcc: "Wolfram Sang" <w.sang@pengutronix.de>
Bcc: Alan Cox <alan@linux.intel.com>
Bcc: Alan Stern <stern@rowland.harvard.edu>
Bcc: Alessandro Rubini <rubini@unipv.it>
Bcc: Andreas Westin <andreas.westin@stericsson.com>
Bcc: Andrew Lunn <andrew@lunn.ch>
Bcc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Bcc: Axel Lin <axel.lin@gmail.com>
Bcc: Ben Dooks <ben-linux@fluff.org>
Bcc: Bryan Huntsman <bryanh@codeaurora.org>
Bcc: Bryan Wu <bryan.wu@canonical.com>
Bcc: Chris Ball <cjb@laptop.org>
Bcc: Colin Cross <ccross@android.com>
Bcc: Dan Williams <djbw@fb.com>
Bcc: Daniel Ribeiro <drwyrm@gmail.com>
Bcc: Daniel Walker <dwalker@fifo99.com>
Bcc: David Brown <davidb@codeaurora.org>
Bcc: David Woodhouse <dwmw2@infradead.org>
Bcc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Bcc: Eric Miao <eric.y.miao@gmail.com>
Bcc: Felipe Balbi <balbi@ti.com>
Bcc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Bcc: Grant Likely <grant.likely@secretlab.ca>
Bcc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bcc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Bcc: Guenter Roeck <linux@roeck-us.net>
Bcc: Haojian Zhuang <haojian.zhuang@gmail.com>
Bcc: Harald Welte <laforge@openezx.org>
Bcc: Hartley Sweeten <hsweeten@visionengravers.com>
Bcc: Herbert Xu <herbert@gondor.apana.org.au>
Bcc: J Keerthy <j-keerthy@ti.com>
Bcc: Jarkko Nikula <jarkko.nikula@bitmer.com>
Bcc: Jaroslav Kysela <perex@perex.cz>
Bcc: Jason Cooper <jason@lakedaemon.net>
Bcc: Javier Martin <javier.martin@vista-silicon.com>
Bcc: Jean Pihet <j-pihet@ti.com>
Bcc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Bcc: Jeff Garzik <jgarzik@pobox.com>
Bcc: Jochen Friedrich <jochen@scram.de>
Bcc: Jonathan Cameron <jic23@cam.ac.uk>
Bcc: Kevin Hilman <khilman@ti.com>
Bcc: Kukjin Kim <kgene.kim@samsung.com>
Bcc: Kyungmin Park <kyungmin.park@samsung.com>
Bcc: Liam Girdwood <lrg@ti.com>
Bcc: Linus Walleij <linus.walleij@linaro.org>
Bcc: Marek Vasut <marek.vasut@gmail.com>
Bcc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Bcc: Mauro Carvalho Chehab <mchehab@infradead.org>
Bcc: Mika Westerberg <mika.westerberg@iki.fi>
Bcc: Nicolas Ferre <nicolas.ferre@atmel.com>
Bcc: Nicolas Pitre <nico@fluxnic.net>
Bcc: Ohad Ben-Cohen <ohad@wizery.com>
Bcc: Olof Johansson <olof@lixom.net>
Bcc: Omar Ramirez Luna <omar.ramirez@ti.com>
Bcc: Paul Parsons <lost.distance@yahoo.com>
Bcc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Bcc: Philipp Zabel <philipp.zabel@gmail.com>
Bcc: Richard Purdie <rpurdie@rpsys.net>
Bcc: Robert Jarzmik <robert.jarzmik@free.fr>
Bcc: Russell King <linux@arm.linux.org.uk>
Bcc: Ryan Mallon <rmallon@gmail.com>
Bcc: STEricsson <STEricsson_nomadik_linux@list.st.com>
Bcc: Samuel Ortiz <samuel@sortiz.org>
Bcc: Sangbeom Kim <sbkim73@samsung.com>
Bcc: Sascha Hauer <s.hauer@pengutronix.de>
Bcc: Sekhar Nori <nsekhar@ti.com>
Bcc: Sergey Lapin <slapin@ossfans.org>
Bcc: Shawn Guo <shawn.guo@linaro.org>
Bcc: Shiraz Hashim <shiraz.hashim@st.com>
Bcc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Bcc: Stefan Schmidt <stefan@openezx.org>
Bcc: Stephen Warren <swarren@wwwdotorg.org>
Bcc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Bcc: Takashi Iwai <tiwai@suse.de>
Bcc: Tomas Cech <sleep_walker@suse.cz>
Bcc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Bcc: Tony Lindgren <tony@atomide.com>
Bcc: Tony Prisk <linux@prisktech.co.nz>
Bcc: Vinod Koul <vinod.koul@intel.com>
Bcc: Viresh Kumar <viresh.linux@gmail.com>
Bcc: Wan ZongShun <mcuos.com@gmail.com>
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 01/16] ARM: at91: move platform_data definitions
2012-09-11 12:59 ` [PATCH 00/16] ARM: big platform data header rename Arnd Bergmann
@ 2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 12:59 ` [PATCH 02/16] ARM: davinci: " Arnd Bergmann
` (13 more replies)
2012-09-11 13:02 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
1 sibling, 14 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 12:59 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, Nicolas Ferre,
Jean-Christophe Plagniol-Villard, Vinod Koul, Dan Williams
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 at91 include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <djbw@fb.com>
---
arch/arm/mach-at91/at91sam9g45_devices.c | 2 +-
arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
arch/arm/mach-at91/include/mach/atmel-mci.h | 2 +-
drivers/dma/at_hdmac_regs.h | 2 +-
include/linux/platform_data/atmel-aes.h | 2 +-
.../mach/at_hdmac.h => include/linux/platform_data/dma-atmel.h | 0
6 files changed, 5 insertions(+), 5 deletions(-)
rename arch/arm/mach-at91/include/mach/at_hdmac.h => include/linux/platform_data/dma-atmel.h (100%)
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index 0607399..0aa9bdb 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -31,7 +31,7 @@
#include <mach/at91sam9g45_matrix.h>
#include <mach/at91_matrix.h>
#include <mach/at91sam9_smc.h>
-#include <mach/at_hdmac.h>
+#include <linux/platform_data/dma-atmel.h>
#include <mach/atmel-mci.h>
#include <media/atmel-isi.h>
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index f09fff9..e4da717 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -22,7 +22,7 @@
#include <mach/at91sam9rl_matrix.h>
#include <mach/at91_matrix.h>
#include <mach/at91sam9_smc.h>
-#include <mach/at_hdmac.h>
+#include <linux/platform_data/dma-atmel.h>
#include "generic.h"
diff --git a/arch/arm/mach-at91/include/mach/atmel-mci.h b/arch/arm/mach-at91/include/mach/atmel-mci.h
index 998cb0c..cd580a1 100644
--- a/arch/arm/mach-at91/include/mach/atmel-mci.h
+++ b/arch/arm/mach-at91/include/mach/atmel-mci.h
@@ -1,7 +1,7 @@
#ifndef __MACH_ATMEL_MCI_H
#define __MACH_ATMEL_MCI_H
-#include <mach/at_hdmac.h>
+#include <linux/platform_data/dma-atmel.h>
/**
* struct mci_dma_data - DMA data for MCI interface
diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h
index 8a6c8e8..116e4ad 100644
--- a/drivers/dma/at_hdmac_regs.h
+++ b/drivers/dma/at_hdmac_regs.h
@@ -11,7 +11,7 @@
#ifndef AT_HDMAC_REGS_H
#define AT_HDMAC_REGS_H
-#include <mach/at_hdmac.h>
+#include <linux/platform_data/dma-atmel.h>
#define AT_DMA_MAX_NR_CHANNELS 8
diff --git a/include/linux/platform_data/atmel-aes.h b/include/linux/platform_data/atmel-aes.h
index e7a1949..ab68082 100644
--- a/include/linux/platform_data/atmel-aes.h
+++ b/include/linux/platform_data/atmel-aes.h
@@ -1,7 +1,7 @@
#ifndef __LINUX_ATMEL_AES_H
#define __LINUX_ATMEL_AES_H
-#include <mach/at_hdmac.h>
+#include <linux/platform_data/dma-atmel.h>
/**
* struct aes_dma_data - DMA data for AES
diff --git a/arch/arm/mach-at91/include/mach/at_hdmac.h b/include/linux/platform_data/dma-atmel.h
similarity index 100%
rename from arch/arm/mach-at91/include/mach/at_hdmac.h
rename to include/linux/platform_data/dma-atmel.h
--
1.7.10
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 02/16] ARM: davinci: move platform_data definitions
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
@ 2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 13:05 ` Felipe Balbi
2012-09-12 10:42 ` Hebbar, Gururaja
2012-09-11 12:59 ` [PATCH 03/16] ARM: ep93xx: " Arnd Bergmann
` (12 subsequent siblings)
13 siblings, 2 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 12:59 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, Sekhar Nori,
Kevin Hilman, Ben Dooks, Wolfram Sang, Dmitry Torokhov,
Mauro Carvalho Chehab, Chris Ball, David Woodhouse, Grant Likely,
Alan Stern, Greg Kroah-Hartman, Felipe Balbi, Liam Girdwood,
Mark Brown, davinci-linux-open-source
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 davinci include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: "Ben Dooks" <ben-linux@fluff.org>
Cc: "Wolfram Sang" <w.sang@pengutronix.de>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.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: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: davinci-linux-open-source@linux.davincidsp.com
---
arch/arm/mach-davinci/aemif.c | 2 +-
arch/arm/mach-davinci/board-da830-evm.c | 8 ++++----
arch/arm/mach-davinci/board-da850-evm.c | 6 +++---
arch/arm/mach-davinci/board-dm355-evm.c | 8 ++++----
arch/arm/mach-davinci/board-dm355-leopard.c | 8 ++++----
arch/arm/mach-davinci/board-dm365-evm.c | 8 ++++----
arch/arm/mach-davinci/board-dm644x-evm.c | 10 +++++-----
arch/arm/mach-davinci/board-dm646x-evm.c | 6 +++---
arch/arm/mach-davinci/board-mityomapl138.c | 4 ++--
arch/arm/mach-davinci/board-neuros-osd2.c | 8 ++++----
arch/arm/mach-davinci/board-sffsdr.c | 4 ++--
arch/arm/mach-davinci/davinci.h | 4 ++--
arch/arm/mach-davinci/devices.c | 4 ++--
arch/arm/mach-davinci/dm355.c | 4 ++--
arch/arm/mach-davinci/dm365.c | 6 +++---
arch/arm/mach-davinci/dm644x.c | 2 +-
arch/arm/mach-davinci/dm646x.c | 2 +-
arch/arm/mach-davinci/include/mach/da8xx.h | 10 +++++-----
arch/arm/mach-davinci/include/mach/tnetv107x.h | 4 ++--
arch/arm/mach-davinci/usb.c | 2 +-
drivers/i2c/busses/i2c-davinci.c | 2 +-
drivers/input/keyboard/davinci_keyscan.c | 2 +-
drivers/media/video/davinci/vpbe_venc.c | 2 +-
drivers/mmc/host/davinci_mmc.c | 2 +-
drivers/mtd/nand/davinci_nand.c | 4 ++--
drivers/spi/spi-davinci.c | 2 +-
drivers/usb/host/ohci-da8xx.c | 2 +-
drivers/usb/musb/da8xx.c | 2 +-
.../asp.h => include/linux/platform_data/asoc-davinci-evm.h | 0
.../mach/i2c.h => include/linux/platform_data/i2c-davinci.h | 0
.../linux/platform_data/keyscan-davinci.h | 0
.../mach/mmc.h => include/linux/platform_data/mmc-davinci.h | 0
.../linux/platform_data/mtd-davinci-aemif.h | 0
.../mach/nand.h => include/linux/platform_data/mtd-davinci.h | 0
.../mach/spi.h => include/linux/platform_data/spi-davinci.h | 0
.../mach/usb.h => include/linux/platform_data/usb-davinci.h | 0
sound/soc/davinci/davinci-evm.c | 2 +-
sound/soc/davinci/davinci-i2s.c | 2 +-
sound/soc/davinci/davinci-mcasp.h | 2 +-
sound/soc/davinci/davinci-pcm.h | 2 +-
40 files changed, 68 insertions(+), 68 deletions(-)
rename arch/arm/mach-davinci/include/mach/asp.h => include/linux/platform_data/asoc-davinci-evm.h (100%)
rename arch/arm/mach-davinci/include/mach/i2c.h => include/linux/platform_data/i2c-davinci.h (100%)
rename arch/arm/mach-davinci/include/mach/keyscan.h => include/linux/platform_data/keyscan-davinci.h (100%)
rename arch/arm/mach-davinci/include/mach/mmc.h => include/linux/platform_data/mmc-davinci.h (100%)
rename arch/arm/mach-davinci/include/mach/aemif.h => include/linux/platform_data/mtd-davinci-aemif.h (100%)
rename arch/arm/mach-davinci/include/mach/nand.h => include/linux/platform_data/mtd-davinci.h (100%)
rename arch/arm/mach-davinci/include/mach/spi.h => include/linux/platform_data/spi-davinci.h (100%)
rename arch/arm/mach-davinci/include/mach/usb.h => include/linux/platform_data/usb-davinci.h (100%)
diff --git a/arch/arm/mach-davinci/aemif.c b/arch/arm/mach-davinci/aemif.c
index 1ce70a9..f091a90 100644
--- a/arch/arm/mach-davinci/aemif.c
+++ b/arch/arm/mach-davinci/aemif.c
@@ -15,7 +15,7 @@
#include <linux/module.h>
#include <linux/time.h>
-#include <mach/aemif.h>
+#include <linux/platform_data/mtd-davinci-aemif.h>
/* Timing value configuration */
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 0031864..95b5e10 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -28,11 +28,11 @@
#include <mach/cp_intc.h>
#include <mach/mux.h>
-#include <mach/nand.h>
+#include <linux/platform_data/mtd-davinci.h>
#include <mach/da8xx.h>
-#include <mach/usb.h>
-#include <mach/aemif.h>
-#include <mach/spi.h>
+#include <linux/platform_data/usb-davinci.h>
+#include <linux/platform_data/mtd-davinci-aemif.h>
+#include <linux/platform_data/spi-davinci.h>
#define DA830_EVM_PHY_ID ""
/*
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 0149fb4..1295e61 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -40,10 +40,10 @@
#include <mach/cp_intc.h>
#include <mach/da8xx.h>
-#include <mach/nand.h>
+#include <linux/platform_data/mtd-davinci.h>
#include <mach/mux.h>
-#include <mach/aemif.h>
-#include <mach/spi.h>
+#include <linux/platform_data/mtd-davinci-aemif.h>
+#include <linux/platform_data/spi-davinci.h>
#define DA850_EVM_PHY_ID "davinci_mdio-0:00"
#define DA850_LCD_PWR_PIN GPIO_TO_PIN(2, 8)
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index 1c7b1f4..88ebea8 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -26,11 +26,11 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
-#include <mach/nand.h>
-#include <mach/mmc.h>
-#include <mach/usb.h>
+#include <linux/platform_data/mtd-davinci.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/usb-davinci.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index 8e77032..2f88103 100644
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -23,11 +23,11 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
-#include <mach/nand.h>
-#include <mach/mmc.h>
-#include <mach/usb.h>
+#include <linux/platform_data/mtd-davinci.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/usb-davinci.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 688a9c5..1b4a8ad 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -33,11 +33,11 @@
#include <mach/mux.h>
#include <mach/common.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
-#include <mach/mmc.h>
-#include <mach/nand.h>
-#include <mach/keyscan.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/mtd-davinci.h>
+#include <linux/platform_data/keyscan-davinci.h>
#include <media/tvp514x.h>
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index d34ed55..ca72fc4 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -31,13 +31,13 @@
#include <asm/mach/arch.h>
#include <mach/common.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
#include <mach/mux.h>
-#include <mach/nand.h>
-#include <mach/mmc.h>
-#include <mach/usb.h>
-#include <mach/aemif.h>
+#include <linux/platform_data/mtd-davinci.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/usb-davinci.h>
+#include <linux/platform_data/mtd-davinci-aemif.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 958679a..9944367 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -38,11 +38,11 @@
#include <mach/common.h>
#include <mach/serial.h>
-#include <mach/i2c.h>
-#include <mach/nand.h>
+#include <linux/platform_data/i2c-davinci.h>
+#include <linux/platform_data/mtd-davinci.h>
#include <mach/clock.h>
#include <mach/cdce949.h>
-#include <mach/aemif.h>
+#include <linux/platform_data/mtd-davinci-aemif.h>
#include "davinci.h"
#include "clock.h"
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
index beecde3..43e4a0d 100644
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -26,9 +26,9 @@
#include <mach/common.h>
#include <mach/cp_intc.h>
#include <mach/da8xx.h>
-#include <mach/nand.h>
+#include <linux/platform_data/mtd-davinci.h>
#include <mach/mux.h>
-#include <mach/spi.h>
+#include <linux/platform_data/spi-davinci.h>
#define MITYOMAPL138_PHY_ID ""
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index f6b9fc7..144bf31 100644
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -31,12 +31,12 @@
#include <asm/mach/arch.h>
#include <mach/common.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
#include <mach/mux.h>
-#include <mach/nand.h>
-#include <mach/mmc.h>
-#include <mach/usb.h>
+#include <linux/platform_data/mtd-davinci.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/usb-davinci.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index 9078acf..6957787 100644
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -36,10 +36,10 @@
#include <asm/mach/flash.h>
#include <mach/common.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
#include <mach/mux.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-davinci.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h
index 8db0fc6..43ddf87 100644
--- a/arch/arm/mach-davinci/davinci.h
+++ b/arch/arm/mach-davinci/davinci.h
@@ -23,8 +23,8 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
-#include <mach/asp.h>
-#include <mach/keyscan.h>
+#include <linux/platform_data/asoc-davinci-evm.h>
+#include <linux/platform_data/keyscan-davinci.h>
#include <mach/hardware.h>
#include <media/davinci/vpfe_capture.h>
diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
index d2f96662..3a42b6f 100644
--- a/arch/arm/mach-davinci/devices.c
+++ b/arch/arm/mach-davinci/devices.c
@@ -15,12 +15,12 @@
#include <linux/io.h>
#include <mach/hardware.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <mach/irqs.h>
#include <mach/cputype.h>
#include <mach/mux.h>
#include <mach/edma.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-davinci.h>
#include <mach/time.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 678cd99..612e403 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -26,8 +26,8 @@
#include <mach/time.h>
#include <mach/serial.h>
#include <mach/common.h>
-#include <mach/asp.h>
-#include <mach/spi.h>
+#include <linux/platform_data/asoc-davinci-evm.h>
+#include <linux/platform_data/spi-davinci.h>
#include <mach/gpio-davinci.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index a50d49de..ee4b0b0 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -29,9 +29,9 @@
#include <mach/time.h>
#include <mach/serial.h>
#include <mach/common.h>
-#include <mach/asp.h>
-#include <mach/keyscan.h>
-#include <mach/spi.h>
+#include <linux/platform_data/asoc-davinci-evm.h>
+#include <linux/platform_data/keyscan-davinci.h>
+#include <linux/platform_data/spi-davinci.h>
#include <mach/gpio-davinci.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index c8b8666..9018a44 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -23,7 +23,7 @@
#include <mach/time.h>
#include <mach/serial.h>
#include <mach/common.h>
-#include <mach/asp.h>
+#include <linux/platform_data/asoc-davinci-evm.h>
#include <mach/gpio-davinci.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 9eb87c1..56f8e6e 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -24,7 +24,7 @@
#include <mach/time.h>
#include <mach/serial.h>
#include <mach/common.h>
-#include <mach/asp.h>
+#include <linux/platform_data/asoc-davinci-evm.h>
#include <mach/gpio-davinci.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index a2f1f27..a273d06 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -19,12 +19,12 @@
#include <mach/serial.h>
#include <mach/edma.h>
-#include <mach/i2c.h>
-#include <mach/asp.h>
-#include <mach/mmc.h>
-#include <mach/usb.h>
+#include <linux/platform_data/i2c-davinci.h>
+#include <linux/platform_data/asoc-davinci-evm.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/usb-davinci.h>
#include <mach/pm.h>
-#include <mach/spi.h>
+#include <linux/platform_data/spi-davinci.h>
extern void __iomem *da8xx_syscfg0_base;
extern void __iomem *da8xx_syscfg1_base;
diff --git a/arch/arm/mach-davinci/include/mach/tnetv107x.h b/arch/arm/mach-davinci/include/mach/tnetv107x.h
index 83e5926..1656a02 100644
--- a/arch/arm/mach-davinci/include/mach/tnetv107x.h
+++ b/arch/arm/mach-davinci/include/mach/tnetv107x.h
@@ -36,8 +36,8 @@
#include <linux/input/matrix_keypad.h>
#include <linux/mfd/ti_ssp.h>
-#include <mach/mmc.h>
-#include <mach/nand.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/mtd-davinci.h>
#include <mach/serial.h>
struct tnetv107x_device_info {
diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
index 23d2b6d..f77b953 100644
--- a/arch/arm/mach-davinci/usb.c
+++ b/arch/arm/mach-davinci/usb.c
@@ -10,7 +10,7 @@
#include <mach/common.h>
#include <mach/irqs.h>
#include <mach/cputype.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-davinci.h>
#define DAVINCI_USB_OTG_BASE 0x01c64000
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index 79b4bcb..79a2542 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -40,7 +40,7 @@
#include <linux/gpio.h>
#include <mach/hardware.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
/* ----- global defines ----------------------------------------------- */
diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c
index 9d82b3a..d5bacbb 100644
--- a/drivers/input/keyboard/davinci_keyscan.c
+++ b/drivers/input/keyboard/davinci_keyscan.c
@@ -36,7 +36,7 @@
#include <mach/hardware.h>
#include <mach/irqs.h>
-#include <mach/keyscan.h>
+#include <linux/platform_data/keyscan-davinci.h>
/* Key scan registers */
#define DAVINCI_KEYSCAN_KEYCTRL 0x0000
diff --git a/drivers/media/video/davinci/vpbe_venc.c b/drivers/media/video/davinci/vpbe_venc.c
index b21ecc8..0302669 100644
--- a/drivers/media/video/davinci/vpbe_venc.c
+++ b/drivers/media/video/davinci/vpbe_venc.c
@@ -27,7 +27,7 @@
#include <mach/hardware.h>
#include <mach/mux.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <linux/io.h>
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index 7cf6c62..3dfd347 100644
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -33,7 +33,7 @@
#include <linux/dma-mapping.h>
#include <linux/mmc/mmc.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-davinci.h>
#include <mach/edma.h>
/*
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index d94b03c..f1deb1e 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -34,8 +34,8 @@
#include <linux/mtd/partitions.h>
#include <linux/slab.h>
-#include <mach/nand.h>
-#include <mach/aemif.h>
+#include <linux/platform_data/mtd-davinci.h>
+#include <linux/platform_data/mtd-davinci-aemif.h>
/*
* This is a device driver for the NAND flash controller found on the
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 9b2901f..3afe2f4 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -30,7 +30,7 @@
#include <linux/spi/spi_bitbang.h>
#include <linux/slab.h>
-#include <mach/spi.h>
+#include <linux/platform_data/spi-davinci.h>
#include <mach/edma.h>
#define SPI_NO_RESOURCE ((resource_size_t)-1)
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index 269b1e0..0b815a8 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -17,7 +17,7 @@
#include <linux/clk.h>
#include <mach/da8xx.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-davinci.h>
#ifndef CONFIG_ARCH_DAVINCI_DA8XX
#error "This file is DA8xx bus glue. Define CONFIG_ARCH_DAVINCI_DA8XX."
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
index 0f9fcec..15a2627 100644
--- a/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
@@ -35,7 +35,7 @@
#include <linux/dma-mapping.h>
#include <mach/da8xx.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-davinci.h>
#include "musb_core.h"
diff --git a/arch/arm/mach-davinci/include/mach/asp.h b/include/linux/platform_data/asoc-davinci-evm.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/asp.h
rename to include/linux/platform_data/asoc-davinci-evm.h
diff --git a/arch/arm/mach-davinci/include/mach/i2c.h b/include/linux/platform_data/i2c-davinci.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/i2c.h
rename to include/linux/platform_data/i2c-davinci.h
diff --git a/arch/arm/mach-davinci/include/mach/keyscan.h b/include/linux/platform_data/keyscan-davinci.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/keyscan.h
rename to include/linux/platform_data/keyscan-davinci.h
diff --git a/arch/arm/mach-davinci/include/mach/mmc.h b/include/linux/platform_data/mmc-davinci.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/mmc.h
rename to include/linux/platform_data/mmc-davinci.h
diff --git a/arch/arm/mach-davinci/include/mach/aemif.h b/include/linux/platform_data/mtd-davinci-aemif.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/aemif.h
rename to include/linux/platform_data/mtd-davinci-aemif.h
diff --git a/arch/arm/mach-davinci/include/mach/nand.h b/include/linux/platform_data/mtd-davinci.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/nand.h
rename to include/linux/platform_data/mtd-davinci.h
diff --git a/arch/arm/mach-davinci/include/mach/spi.h b/include/linux/platform_data/spi-davinci.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/spi.h
rename to include/linux/platform_data/spi-davinci.h
diff --git a/arch/arm/mach-davinci/include/mach/usb.h b/include/linux/platform_data/usb-davinci.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/usb.h
rename to include/linux/platform_data/usb-davinci.h
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index 10a2d8c..5717bed 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -22,7 +22,7 @@
#include <asm/dma.h>
#include <asm/mach-types.h>
-#include <mach/asp.h>
+#include <linux/platform_data/asoc-davinci-evm.h>
#include <mach/edma.h>
#include <mach/mux.h>
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index 0a74b95..6e58828 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -23,7 +23,7 @@
#include <sound/initval.h>
#include <sound/soc.h>
-#include <mach/asp.h>
+#include <linux/platform_data/asoc-davinci-evm.h>
#include "davinci-pcm.h"
#include "davinci-i2s.h"
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
index 4681acc..302aab2 100644
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/davinci/davinci-mcasp.h
@@ -19,7 +19,7 @@
#define DAVINCI_MCASP_H
#include <linux/io.h>
-#include <mach/asp.h>
+#include <linux/platform_data/asoc-davinci-evm.h>
#include "davinci-pcm.h"
#define DAVINCI_MCASP_RATES SNDRV_PCM_RATE_8000_96000
diff --git a/sound/soc/davinci/davinci-pcm.h b/sound/soc/davinci/davinci-pcm.h
index c0d6c9b..36d31cd 100644
--- a/sound/soc/davinci/davinci-pcm.h
+++ b/sound/soc/davinci/davinci-pcm.h
@@ -13,7 +13,7 @@
#define _DAVINCI_PCM_H
#include <mach/edma.h>
-#include <mach/asp.h>
+#include <linux/platform_data/asoc-davinci-evm.h>
struct davinci_pcm_dma_params {
--
1.7.10
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 03/16] ARM: ep93xx: move platform_data definitions
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
2012-09-11 12:59 ` [PATCH 02/16] ARM: davinci: " Arnd Bergmann
@ 2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 16:26 ` H Hartley Sweeten
` (2 more replies)
2012-09-11 12:59 ` [PATCH 04/16] ARM: imx: " Arnd Bergmann
` (11 subsequent siblings)
13 siblings, 3 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 12:59 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, Grant Likely,
Hartley Sweeten, Ryan Mallon, Vinod Koul, Dan Williams,
Florian Tobias Schandinat, Liam Girdwood, Mark Brown,
Jaroslav Kysela, Takashi Iwai, Mika Westerberg, Axel Lin
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 ep93xx include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ryan Mallon <rmallon@gmail.com>
Cc: Jeff Garzik <jgarzik@pobox.com> (supporter:SERIAL ATA
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <djbw@fb.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> (maintainer:INPUT
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Mika Westerberg <mika.westerberg@iki.fi>
Cc: Axel Lin <axel.lin@gmail.com>
---
Documentation/spi/ep93xx_spi | 2 +-
arch/arm/mach-ep93xx/core.c | 6 +++---
arch/arm/mach-ep93xx/dma.c | 2 +-
arch/arm/mach-ep93xx/edb93xx.c | 4 ++--
arch/arm/mach-ep93xx/simone.c | 2 +-
arch/arm/mach-ep93xx/snappercl15.c | 2 +-
arch/arm/mach-ep93xx/vision_ep9307.c | 4 ++--
drivers/ata/pata_ep93xx.c | 2 +-
drivers/dma/ep93xx_dma.c | 2 +-
drivers/input/keyboard/ep93xx_keypad.c | 2 +-
drivers/spi/spi-ep93xx.c | 4 ++--
drivers/video/ep93xx-fb.c | 2 +-
.../mach/dma.h => include/linux/platform_data/dma-ep93xx.h | 0
.../linux/platform_data/keypad-ep93xx.h | 0
.../ep93xx_spi.h => include/linux/platform_data/spi-ep93xx.h | 0
.../mach/fb.h => include/linux/platform_data/video-ep93xx.h | 0
sound/soc/ep93xx/ep93xx-ac97.c | 2 +-
sound/soc/ep93xx/ep93xx-i2s.c | 2 +-
sound/soc/ep93xx/ep93xx-pcm.c | 2 +-
19 files changed, 20 insertions(+), 20 deletions(-)
rename arch/arm/mach-ep93xx/include/mach/dma.h => include/linux/platform_data/dma-ep93xx.h (100%)
rename arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h => include/linux/platform_data/keypad-ep93xx.h (100%)
rename arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h => include/linux/platform_data/spi-ep93xx.h (100%)
rename arch/arm/mach-ep93xx/include/mach/fb.h => include/linux/platform_data/video-ep93xx.h (100%)
diff --git a/Documentation/spi/ep93xx_spi b/Documentation/spi/ep93xx_spi
index d8eb01c..832ddce 100644
--- a/Documentation/spi/ep93xx_spi
+++ b/Documentation/spi/ep93xx_spi
@@ -26,7 +26,7 @@ arch/arm/mach-ep93xx/ts72xx.c:
#include <linux/gpio.h>
#include <linux/spi/spi.h>
-#include <mach/ep93xx_spi.h>
+#include <linux/platform_data/spi-ep93xx.h>
/* this is our GPIO line used for chip select */
#define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO9
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index 4afe52a..e85bf17 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -36,9 +36,9 @@
#include <linux/export.h>
#include <mach/hardware.h>
-#include <mach/fb.h>
-#include <mach/ep93xx_keypad.h>
-#include <mach/ep93xx_spi.h>
+#include <linux/platform_data/video-ep93xx.h>
+#include <linux/platform_data/keypad-ep93xx.h>
+#include <linux/platform_data/spi-ep93xx.h>
#include <mach/gpio-ep93xx.h>
#include <asm/mach/map.h>
diff --git a/arch/arm/mach-ep93xx/dma.c b/arch/arm/mach-ep93xx/dma.c
index 16976d7..d8bfd02 100644
--- a/arch/arm/mach-ep93xx/dma.c
+++ b/arch/arm/mach-ep93xx/dma.c
@@ -25,7 +25,7 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
-#include <mach/dma.h>
+#include <linux/platform_data/dma-ep93xx.h>
#include <mach/hardware.h>
#include "soc.h"
diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c
index 337ab7c..b8f53d5 100644
--- a/arch/arm/mach-ep93xx/edb93xx.c
+++ b/arch/arm/mach-ep93xx/edb93xx.c
@@ -35,8 +35,8 @@
#include <sound/cs4271.h>
#include <mach/hardware.h>
-#include <mach/fb.h>
-#include <mach/ep93xx_spi.h>
+#include <linux/platform_data/video-ep93xx.h>
+#include <linux/platform_data/spi-ep93xx.h>
#include <mach/gpio-ep93xx.h>
#include <asm/hardware/vic.h>
diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c
index 33dc079..0eb3f17 100644
--- a/arch/arm/mach-ep93xx/simone.c
+++ b/arch/arm/mach-ep93xx/simone.c
@@ -22,7 +22,7 @@
#include <linux/i2c-gpio.h>
#include <mach/hardware.h>
-#include <mach/fb.h>
+#include <linux/platform_data/video-ep93xx.h>
#include <mach/gpio-ep93xx.h>
#include <asm/hardware/vic.h>
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c
index 01abd35..50043ee 100644
--- a/arch/arm/mach-ep93xx/snappercl15.c
+++ b/arch/arm/mach-ep93xx/snappercl15.c
@@ -28,7 +28,7 @@
#include <linux/mtd/nand.h>
#include <mach/hardware.h>
-#include <mach/fb.h>
+#include <linux/platform_data/video-ep93xx.h>
#include <mach/gpio-ep93xx.h>
#include <asm/hardware/vic.h>
diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c
index 2905a49..ba92e25 100644
--- a/arch/arm/mach-ep93xx/vision_ep9307.c
+++ b/arch/arm/mach-ep93xx/vision_ep9307.c
@@ -30,8 +30,8 @@
#include <linux/mmc/host.h>
#include <mach/hardware.h>
-#include <mach/fb.h>
-#include <mach/ep93xx_spi.h>
+#include <linux/platform_data/video-ep93xx.h>
+#include <linux/platform_data/spi-ep93xx.h>
#include <mach/gpio-ep93xx.h>
#include <asm/hardware/vic.h>
diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c
index 6ef2e37..e056406 100644
--- a/drivers/ata/pata_ep93xx.c
+++ b/drivers/ata/pata_ep93xx.c
@@ -43,7 +43,7 @@
#include <linux/dmaengine.h>
#include <linux/ktime.h>
-#include <mach/dma.h>
+#include <linux/platform_data/dma-ep93xx.h>
#include <mach/platform.h>
#define DRV_NAME "ep93xx-ide"
diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
index c64917e..4aeaea7 100644
--- a/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
@@ -26,7 +26,7 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
-#include <mach/dma.h>
+#include <linux/platform_data/dma-ep93xx.h>
#include "dmaengine.h"
diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c
index c46fc81..7363402 100644
--- a/drivers/input/keyboard/ep93xx_keypad.c
+++ b/drivers/input/keyboard/ep93xx_keypad.c
@@ -29,7 +29,7 @@
#include <linux/slab.h>
#include <mach/hardware.h>
-#include <mach/ep93xx_keypad.h>
+#include <linux/platform_data/keypad-ep93xx.h>
/*
* Keypad Interface Register offsets
diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index f97f1d2..3a21959 100644
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -31,8 +31,8 @@
#include <linux/scatterlist.h>
#include <linux/spi/spi.h>
-#include <mach/dma.h>
-#include <mach/ep93xx_spi.h>
+#include <linux/platform_data/dma-ep93xx.h>
+#include <linux/platform_data/spi-ep93xx.h>
#define SSPCR0 0x0000
#define SSPCR0_MODE_SHIFT 6
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
index 345d962..f2c092da 100644
--- a/drivers/video/ep93xx-fb.c
+++ b/drivers/video/ep93xx-fb.c
@@ -24,7 +24,7 @@
#include <linux/clk.h>
#include <linux/fb.h>
-#include <mach/fb.h>
+#include <linux/platform_data/video-ep93xx.h>
/* Vertical Frame Timing Registers */
#define EP93XXFB_VLINES_TOTAL 0x0000 /* SW locked */
diff --git a/arch/arm/mach-ep93xx/include/mach/dma.h b/include/linux/platform_data/dma-ep93xx.h
similarity index 100%
rename from arch/arm/mach-ep93xx/include/mach/dma.h
rename to include/linux/platform_data/dma-ep93xx.h
diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h b/include/linux/platform_data/keypad-ep93xx.h
similarity index 100%
rename from arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
rename to include/linux/platform_data/keypad-ep93xx.h
diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h b/include/linux/platform_data/spi-ep93xx.h
similarity index 100%
rename from arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h
rename to include/linux/platform_data/spi-ep93xx.h
diff --git a/arch/arm/mach-ep93xx/include/mach/fb.h b/include/linux/platform_data/video-ep93xx.h
similarity index 100%
rename from arch/arm/mach-ep93xx/include/mach/fb.h
rename to include/linux/platform_data/video-ep93xx.h
diff --git a/sound/soc/ep93xx/ep93xx-ac97.c b/sound/soc/ep93xx/ep93xx-ac97.c
index bdffab3..c352165 100644
--- a/sound/soc/ep93xx/ep93xx-ac97.c
+++ b/sound/soc/ep93xx/ep93xx-ac97.c
@@ -21,7 +21,7 @@
#include <sound/ac97_codec.h>
#include <sound/soc.h>
-#include <mach/dma.h>
+#include <linux/platform_data/dma-ep93xx.h>
#include "ep93xx-pcm.h"
/*
diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c
index 8df8f6d..ac4a751 100644
--- a/sound/soc/ep93xx/ep93xx-i2s.c
+++ b/sound/soc/ep93xx/ep93xx-i2s.c
@@ -28,7 +28,7 @@
#include <mach/hardware.h>
#include <mach/ep93xx-regs.h>
-#include <mach/dma.h>
+#include <linux/platform_data/dma-ep93xx.h>
#include "ep93xx-pcm.h"
diff --git a/sound/soc/ep93xx/ep93xx-pcm.c b/sound/soc/ep93xx/ep93xx-pcm.c
index 4eea98b..665d9c9 100644
--- a/sound/soc/ep93xx/ep93xx-pcm.c
+++ b/sound/soc/ep93xx/ep93xx-pcm.c
@@ -25,7 +25,7 @@
#include <sound/soc.h>
#include <sound/dmaengine_pcm.h>
-#include <mach/dma.h>
+#include <linux/platform_data/dma-ep93xx.h>
#include <mach/hardware.h>
#include <mach/ep93xx-regs.h>
--
1.7.10
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 04/16] ARM: imx: move platform_data definitions
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
2012-09-11 12:59 ` [PATCH 02/16] ARM: davinci: " Arnd Bergmann
2012-09-11 12:59 ` [PATCH 03/16] ARM: ep93xx: " Arnd Bergmann
@ 2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 13:40 ` Guennadi Liakhovetski
` (2 more replies)
2012-09-11 12:59 ` [PATCH 05/16] ARM: msm: " Arnd Bergmann
` (10 subsequent siblings)
13 siblings, 3 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 12:59 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, Sascha Hauer,
Vinod Koul, Dan Williams, Ben Dooks (embedded platforms),
Wolfram Sang (embedded platforms),
Mauro Carvalho Chehab, Chris Ball, David Woodhouse, Grant Likely,
Alan Cox, Greg Kroah-Hartman, Felipe Balbi, Alan Stern,
Florian Tobias Schandinat, Liam Girdwood, Mark Brown,
Javier Martin, Shawn Guo, Guennadi Liakhovetski
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 imx include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <djbw@fb.com>
Cc: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
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: Alan Cox <alan@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Javier Martin <javier.martin@vista-silicon.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
arch/arm/mach-imx/ehci-imx25.c | 2 +-
arch/arm/mach-imx/ehci-imx27.c | 2 +-
arch/arm/mach-imx/ehci-imx31.c | 2 +-
arch/arm/mach-imx/ehci-imx35.c | 2 +-
arch/arm/mach-imx/ehci-imx5.c | 2 +-
arch/arm/mach-imx/mach-mx31moboard.c | 2 +-
arch/arm/mach-imx/mx1-camera-fiq-ksym.c | 2 +-
.../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 2 +-
arch/arm/plat-mxc/include/mach/devices-common.h | 32 ++++++++++----------
arch/arm/plat-mxc/ssi-fiq-ksym.c | 2 +-
drivers/dma/imx-dma.c | 2 +-
drivers/dma/imx-sdma.c | 4 +--
drivers/i2c/busses/i2c-imx.c | 2 +-
drivers/media/video/mx1_camera.c | 2 +-
drivers/media/video/mx2_camera.c | 2 +-
drivers/media/video/mx3_camera.c | 4 +--
drivers/mmc/host/mxcmmc.c | 4 +--
drivers/mmc/host/sdhci-esdhc-imx.c | 2 +-
drivers/mtd/nand/mxc_nand.c | 2 +-
drivers/spi/spi-imx.c | 2 +-
drivers/tty/serial/imx.c | 2 +-
drivers/usb/gadget/imx_udc.c | 2 +-
drivers/usb/host/ehci-mxc.c | 2 +-
drivers/usb/host/imx21-hcd.h | 2 +-
drivers/video/imxfb.c | 2 +-
drivers/video/mx3fb.c | 4 +--
.../linux/platform_data/asoc-imx-ssi.h | 0
.../linux/platform_data/camera-mx1.h | 0
.../linux/platform_data/camera-mx2.h | 0
.../linux/platform_data/camera-mx3.h | 0
.../linux/platform_data/dma-imx-sdma.h | 0
.../dma.h => include/linux/platform_data/dma-imx.h | 0
.../i2c.h => include/linux/platform_data/i2c-imx.h | 0
.../linux/platform_data/mmc-esdhc-imx.h | 0
.../linux/platform_data/mmc-mxcmmc.h | 0
.../linux/platform_data/mtd-mxc_nand.h | 0
.../linux/platform_data/serial-imx.h | 0
.../spi.h => include/linux/platform_data/spi-imx.h | 0
.../linux/platform_data/usb-ehci-mxc.h | 0
.../linux/platform_data/usb-imx_udc.h | 0
.../linux/platform_data/usb-mx2.h | 0
.../linux/platform_data/video-imxfb.h | 0
.../linux/platform_data/video-mx3fb.h | 0
sound/soc/fsl/imx-pcm-dma.c | 2 +-
sound/soc/fsl/imx-pcm-fiq.c | 2 +-
sound/soc/fsl/imx-ssi.c | 2 +-
sound/soc/fsl/imx-ssi.h | 2 +-
47 files changed, 49 insertions(+), 49 deletions(-)
rename arch/arm/plat-mxc/include/mach/ssi.h => include/linux/platform_data/asoc-imx-ssi.h (100%)
rename arch/arm/plat-mxc/include/mach/mx1_camera.h => include/linux/platform_data/camera-mx1.h (100%)
rename arch/arm/plat-mxc/include/mach/mx2_cam.h => include/linux/platform_data/camera-mx2.h (100%)
rename arch/arm/plat-mxc/include/mach/mx3_camera.h => include/linux/platform_data/camera-mx3.h (100%)
rename arch/arm/plat-mxc/include/mach/sdma.h => include/linux/platform_data/dma-imx-sdma.h (100%)
rename arch/arm/plat-mxc/include/mach/dma.h => include/linux/platform_data/dma-imx.h (100%)
rename arch/arm/plat-mxc/include/mach/i2c.h => include/linux/platform_data/i2c-imx.h (100%)
rename arch/arm/plat-mxc/include/mach/esdhc.h => include/linux/platform_data/mmc-esdhc-imx.h (100%)
rename arch/arm/plat-mxc/include/mach/mmc.h => include/linux/platform_data/mmc-mxcmmc.h (100%)
rename arch/arm/plat-mxc/include/mach/mxc_nand.h => include/linux/platform_data/mtd-mxc_nand.h (100%)
rename arch/arm/plat-mxc/include/mach/imx-uart.h => include/linux/platform_data/serial-imx.h (100%)
rename arch/arm/plat-mxc/include/mach/spi.h => include/linux/platform_data/spi-imx.h (100%)
rename arch/arm/plat-mxc/include/mach/mxc_ehci.h => include/linux/platform_data/usb-ehci-mxc.h (100%)
rename arch/arm/plat-mxc/include/mach/usb.h => include/linux/platform_data/usb-imx_udc.h (100%)
rename arch/arm/plat-mxc/include/mach/mx21-usbhost.h => include/linux/platform_data/usb-mx2.h (100%)
rename arch/arm/plat-mxc/include/mach/imxfb.h => include/linux/platform_data/video-imxfb.h (100%)
rename arch/arm/plat-mxc/include/mach/mx3fb.h => include/linux/platform_data/video-mx3fb.h (100%)
diff --git a/arch/arm/mach-imx/ehci-imx25.c b/arch/arm/mach-imx/ehci-imx25.c
index 05bb41d..412c583 100644
--- a/arch/arm/mach-imx/ehci-imx25.c
+++ b/arch/arm/mach-imx/ehci-imx25.c
@@ -17,7 +17,7 @@
#include <linux/io.h>
#include <mach/hardware.h>
-#include <mach/mxc_ehci.h>
+#include <linux/platform_data/usb-ehci-mxc.h>
#define USBCTRL_OTGBASE_OFFSET 0x600
diff --git a/arch/arm/mach-imx/ehci-imx27.c b/arch/arm/mach-imx/ehci-imx27.c
index fa69419..cd6e1f8 100644
--- a/arch/arm/mach-imx/ehci-imx27.c
+++ b/arch/arm/mach-imx/ehci-imx27.c
@@ -17,7 +17,7 @@
#include <linux/io.h>
#include <mach/hardware.h>
-#include <mach/mxc_ehci.h>
+#include <linux/platform_data/usb-ehci-mxc.h>
#define USBCTRL_OTGBASE_OFFSET 0x600
diff --git a/arch/arm/mach-imx/ehci-imx31.c b/arch/arm/mach-imx/ehci-imx31.c
index faad0f1..9a880c7 100644
--- a/arch/arm/mach-imx/ehci-imx31.c
+++ b/arch/arm/mach-imx/ehci-imx31.c
@@ -17,7 +17,7 @@
#include <linux/io.h>
#include <mach/hardware.h>
-#include <mach/mxc_ehci.h>
+#include <linux/platform_data/usb-ehci-mxc.h>
#define USBCTRL_OTGBASE_OFFSET 0x600
diff --git a/arch/arm/mach-imx/ehci-imx35.c b/arch/arm/mach-imx/ehci-imx35.c
index 73574c3..779e16e 100644
--- a/arch/arm/mach-imx/ehci-imx35.c
+++ b/arch/arm/mach-imx/ehci-imx35.c
@@ -17,7 +17,7 @@
#include <linux/io.h>
#include <mach/hardware.h>
-#include <mach/mxc_ehci.h>
+#include <linux/platform_data/usb-ehci-mxc.h>
#define USBCTRL_OTGBASE_OFFSET 0x600
diff --git a/arch/arm/mach-imx/ehci-imx5.c b/arch/arm/mach-imx/ehci-imx5.c
index a6a4afb..cf8d00e 100644
--- a/arch/arm/mach-imx/ehci-imx5.c
+++ b/arch/arm/mach-imx/ehci-imx5.c
@@ -17,7 +17,7 @@
#include <linux/io.h>
#include <mach/hardware.h>
-#include <mach/mxc_ehci.h>
+#include <linux/platform_data/usb-ehci-mxc.h>
#define MXC_OTG_OFFSET 0
#define MXC_H1_OFFSET 0x200
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index d46290b..459e754 100644
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -47,7 +47,7 @@
#include <mach/hardware.h>
#include <mach/iomux-mx3.h>
#include <mach/ulpi.h>
-#include <mach/ssi.h>
+#include <linux/platform_data/asoc-imx-ssi.h>
#include "devices-imx31.h"
diff --git a/arch/arm/mach-imx/mx1-camera-fiq-ksym.c b/arch/arm/mach-imx/mx1-camera-fiq-ksym.c
index b09ee12..fb38436 100644
--- a/arch/arm/mach-imx/mx1-camera-fiq-ksym.c
+++ b/arch/arm/mach-imx/mx1-camera-fiq-ksym.c
@@ -11,7 +11,7 @@
#include <linux/platform_device.h>
#include <linux/module.h>
-#include <mach/mx1_camera.h>
+#include <linux/platform_data/camera-mx1.h>
/* IMX camera FIQ handler */
EXPORT_SYMBOL(mx1_camera_sof_fiq_start);
diff --git a/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c b/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c
index 5955f5d..3793e47 100644
--- a/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c
+++ b/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c
@@ -8,7 +8,7 @@
#include <mach/hardware.h>
#include <mach/devices-common.h>
-#include <mach/esdhc.h>
+#include <linux/platform_data/mmc-esdhc-imx.h>
#define imx_sdhci_esdhc_imx_data_entry_single(soc, _devid, _id, hwid) \
{ \
diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h
index a7f5bb1..9e3e3d8 100644
--- a/arch/arm/plat-mxc/include/mach/devices-common.h
+++ b/arch/arm/plat-mxc/include/mach/devices-common.h
@@ -9,7 +9,7 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/init.h>
-#include <mach/sdma.h>
+#include <linux/platform_data/dma-imx-sdma.h>
extern struct device mxc_aips_bus;
extern struct device mxc_ahb_bus;
@@ -74,7 +74,7 @@ struct platform_device *__init imx_add_fsl_usb2_udc(
struct platform_device *__init imx_add_gpio_keys(
const struct gpio_keys_platform_data *pdata);
-#include <mach/mx21-usbhost.h>
+#include <linux/platform_data/usb-mx2.h>
struct imx_imx21_hcd_data {
resource_size_t iobase;
resource_size_t irq;
@@ -98,7 +98,7 @@ struct imx_imxdi_rtc_data {
struct platform_device *__init imx_add_imxdi_rtc(
const struct imx_imxdi_rtc_data *data);
-#include <mach/imxfb.h>
+#include <linux/platform_data/video-imxfb.h>
struct imx_imx_fb_data {
resource_size_t iobase;
resource_size_t iosize;
@@ -108,7 +108,7 @@ struct platform_device *__init imx_add_imx_fb(
const struct imx_imx_fb_data *data,
const struct imx_fb_platform_data *pdata);
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-imx.h>
struct imx_imx_i2c_data {
int id;
resource_size_t iobase;
@@ -129,7 +129,7 @@ struct platform_device *__init imx_add_imx_keypad(
const struct imx_imx_keypad_data *data,
const struct matrix_keymap_data *pdata);
-#include <mach/ssi.h>
+#include <linux/platform_data/asoc-imx-ssi.h>
struct imx_imx_ssi_data {
int id;
resource_size_t iobase;
@@ -144,7 +144,7 @@ struct platform_device *__init imx_add_imx_ssi(
const struct imx_imx_ssi_data *data,
const struct imx_ssi_platform_data *pdata);
-#include <mach/imx-uart.h>
+#include <linux/platform_data/serial-imx.h>
struct imx_imx_uart_3irq_data {
int id;
resource_size_t iobase;
@@ -167,7 +167,7 @@ struct platform_device *__init imx_add_imx_uart_1irq(
const struct imx_imx_uart_1irq_data *data,
const struct imxuart_platform_data *pdata);
-#include <mach/usb.h>
+#include <linux/platform_data/usb-imx_udc.h>
struct imx_imx_udc_data {
resource_size_t iobase;
resource_size_t iosize;
@@ -183,8 +183,8 @@ struct platform_device *__init imx_add_imx_udc(
const struct imx_imx_udc_data *data,
const struct imxusb_platform_data *pdata);
-#include <mach/mx3fb.h>
-#include <mach/mx3_camera.h>
+#include <linux/platform_data/video-mx3fb.h>
+#include <linux/platform_data/camera-mx3.h>
struct imx_ipu_core_data {
resource_size_t iobase;
resource_size_t synirq;
@@ -199,7 +199,7 @@ struct platform_device *__init imx_add_mx3_sdc_fb(
const struct imx_ipu_core_data *data,
struct mx3fb_platform_data *pdata);
-#include <mach/mx1_camera.h>
+#include <linux/platform_data/camera-mx1.h>
struct imx_mx1_camera_data {
resource_size_t iobase;
resource_size_t iosize;
@@ -209,7 +209,7 @@ struct platform_device *__init imx_add_mx1_camera(
const struct imx_mx1_camera_data *data,
const struct mx1_camera_pdata *pdata);
-#include <mach/mx2_cam.h>
+#include <linux/platform_data/camera-mx2.h>
struct imx_mx2_camera_data {
resource_size_t iobasecsi;
resource_size_t iosizecsi;
@@ -224,7 +224,7 @@ struct platform_device *__init imx_add_mx2_camera(
struct platform_device *__init imx_add_mx2_emmaprp(
const struct imx_mx2_camera_data *data);
-#include <mach/mxc_ehci.h>
+#include <linux/platform_data/usb-ehci-mxc.h>
struct imx_mxc_ehci_data {
int id;
resource_size_t iobase;
@@ -234,7 +234,7 @@ struct platform_device *__init imx_add_mxc_ehci(
const struct imx_mxc_ehci_data *data,
const struct mxc_usbh_platform_data *pdata);
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-mxcmmc.h>
struct imx_mxc_mmc_data {
int id;
resource_size_t iobase;
@@ -246,7 +246,7 @@ struct platform_device *__init imx_add_mxc_mmc(
const struct imx_mxc_mmc_data *data,
const struct imxmmc_platform_data *pdata);
-#include <mach/mxc_nand.h>
+#include <linux/platform_data/mtd-mxc_nand.h>
struct imx_mxc_nand_data {
/*
* id is traditionally 0, but -1 is more appropriate. We use -1 for new
@@ -295,7 +295,7 @@ struct imx_mxc_w1_data {
struct platform_device *__init imx_add_mxc_w1(
const struct imx_mxc_w1_data *data);
-#include <mach/esdhc.h>
+#include <linux/platform_data/mmc-esdhc-imx.h>
struct imx_sdhci_esdhc_imx_data {
const char *devid;
int id;
@@ -306,7 +306,7 @@ struct platform_device *__init imx_add_sdhci_esdhc_imx(
const struct imx_sdhci_esdhc_imx_data *data,
const struct esdhc_platform_data *pdata);
-#include <mach/spi.h>
+#include <linux/platform_data/spi-imx.h>
struct imx_spi_imx_data {
const char *devid;
int id;
diff --git a/arch/arm/plat-mxc/ssi-fiq-ksym.c b/arch/arm/plat-mxc/ssi-fiq-ksym.c
index b5fad45..792090f 100644
--- a/arch/arm/plat-mxc/ssi-fiq-ksym.c
+++ b/arch/arm/plat-mxc/ssi-fiq-ksym.c
@@ -10,7 +10,7 @@
#include <linux/module.h>
-#include <mach/ssi.h>
+#include <linux/platform_data/asoc-imx-ssi.h>
EXPORT_SYMBOL(imx_ssi_fiq_tx_buffer);
EXPORT_SYMBOL(imx_ssi_fiq_rx_buffer);
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index 5084975..b90aaec 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -28,7 +28,7 @@
#include <linux/module.h>
#include <asm/irq.h>
-#include <mach/dma.h>
+#include <linux/platform_data/dma-imx.h>
#include <mach/hardware.h>
#include "dmaengine.h"
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 1dc2a4a..1b781d6 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -38,8 +38,8 @@
#include <linux/of_device.h>
#include <asm/irq.h>
-#include <mach/sdma.h>
-#include <mach/dma.h>
+#include <linux/platform_data/dma-imx-sdma.h>
+#include <linux/platform_data/dma-imx.h>
#include <mach/hardware.h>
#include "dmaengine.h"
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 0722f86..b7907ba7 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -54,7 +54,7 @@
#include <linux/pinctrl/consumer.h>
#include <mach/hardware.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-imx.h>
/** Defines ********************************************************************
*******************************************************************************/
diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c
index 560a65a..bbe7099 100644
--- a/drivers/media/video/mx1_camera.c
+++ b/drivers/media/video/mx1_camera.c
@@ -44,7 +44,7 @@
#include <mach/dma-mx1-mx2.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
-#include <mach/mx1_camera.h>
+#include <linux/platform_data/camera-mx1.h>
/*
* CSI registers
diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c
index ac17540..965427f 100644
--- a/drivers/media/video/mx2_camera.c
+++ b/drivers/media/video/mx2_camera.c
@@ -40,7 +40,7 @@
#include <linux/videodev2.h>
-#include <mach/mx2_cam.h>
+#include <linux/platform_data/camera-mx2.h>
#include <mach/hardware.h>
#include <asm/dma.h>
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c
index af2297d..1481b0d 100644
--- a/drivers/media/video/mx3_camera.c
+++ b/drivers/media/video/mx3_camera.c
@@ -25,8 +25,8 @@
#include <media/soc_mediabus.h>
#include <mach/ipu.h>
-#include <mach/mx3_camera.h>
-#include <mach/dma.h>
+#include <linux/platform_data/camera-mx3.h>
+#include <linux/platform_data/dma-imx.h>
#define MX3_CAM_DRV_NAME "mx3-camera"
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index 28ed52d..7b1161d 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -38,9 +38,9 @@
#include <asm/dma.h>
#include <asm/irq.h>
#include <asm/sizes.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-mxcmmc.h>
-#include <mach/dma.h>
+#include <linux/platform_data/dma-imx.h>
#include <mach/hardware.h>
#define DRIVER_NAME "mxc-mmc"
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index e23f813..c4c504c 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -25,7 +25,7 @@
#include <linux/of_device.h>
#include <linux/of_gpio.h>
#include <linux/pinctrl/consumer.h>
-#include <mach/esdhc.h>
+#include <linux/platform_data/mmc-esdhc-imx.h>
#include "sdhci-pltfm.h"
#include "sdhci-esdhc.h"
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 6acc790..5683604 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -36,7 +36,7 @@
#include <linux/of_mtd.h>
#include <asm/mach/flash.h>
-#include <mach/mxc_nand.h>
+#include <linux/platform_data/mtd-mxc_nand.h>
#include <mach/hardware.h>
#define DRIVER_NAME "mxc_nand"
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index e834ff8..63e7fc9 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -39,7 +39,7 @@
#include <linux/of_gpio.h>
#include <linux/pinctrl/consumer.h>
-#include <mach/spi.h>
+#include <linux/platform_data/spi-imx.h>
#define DRIVER_NAME "spi_imx"
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index d5c689d6..fc65ba2 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -51,7 +51,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-#include <mach/imx-uart.h>
+#include <linux/platform_data/serial-imx.h>
/* Register definitions */
#define URXD0 0x0 /* Receiver Register */
diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c
index dc53348..a0eb857 100644
--- a/drivers/usb/gadget/imx_udc.c
+++ b/drivers/usb/gadget/imx_udc.c
@@ -35,7 +35,7 @@
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-imx_udc.h>
#include <mach/hardware.h>
#include "imx_udc.h"
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index 3420137..a6e2ea4 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -25,7 +25,7 @@
#include <linux/slab.h>
#include <mach/hardware.h>
-#include <mach/mxc_ehci.h>
+#include <linux/platform_data/usb-ehci-mxc.h>
#include <asm/mach-types.h>
diff --git a/drivers/usb/host/imx21-hcd.h b/drivers/usb/host/imx21-hcd.h
index 87b29fd..c005770 100644
--- a/drivers/usb/host/imx21-hcd.h
+++ b/drivers/usb/host/imx21-hcd.h
@@ -24,7 +24,7 @@
#ifndef __LINUX_IMX21_HCD_H__
#define __LINUX_IMX21_HCD_H__
-#include <mach/mx21-usbhost.h>
+#include <linux/platform_data/usb-mx2.h>
#define NUM_ISO_ETDS 2
#define USB_NUM_ETD 32
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index caad368..53ffdfc 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -32,7 +32,7 @@
#include <linux/io.h>
#include <linux/math64.h>
-#include <mach/imxfb.h>
+#include <linux/platform_data/video-imxfb.h>
#include <mach/hardware.h>
/*
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index c89f8a8..d738108 100644
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -27,10 +27,10 @@
#include <linux/clk.h>
#include <linux/mutex.h>
-#include <mach/dma.h>
+#include <linux/platform_data/dma-imx.h>
#include <mach/hardware.h>
#include <mach/ipu.h>
-#include <mach/mx3fb.h>
+#include <linux/platform_data/video-mx3fb.h>
#include <asm/io.h>
#include <asm/uaccess.h>
diff --git a/arch/arm/plat-mxc/include/mach/ssi.h b/include/linux/platform_data/asoc-imx-ssi.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/ssi.h
rename to include/linux/platform_data/asoc-imx-ssi.h
diff --git a/arch/arm/plat-mxc/include/mach/mx1_camera.h b/include/linux/platform_data/camera-mx1.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mx1_camera.h
rename to include/linux/platform_data/camera-mx1.h
diff --git a/arch/arm/plat-mxc/include/mach/mx2_cam.h b/include/linux/platform_data/camera-mx2.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mx2_cam.h
rename to include/linux/platform_data/camera-mx2.h
diff --git a/arch/arm/plat-mxc/include/mach/mx3_camera.h b/include/linux/platform_data/camera-mx3.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mx3_camera.h
rename to include/linux/platform_data/camera-mx3.h
diff --git a/arch/arm/plat-mxc/include/mach/sdma.h b/include/linux/platform_data/dma-imx-sdma.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/sdma.h
rename to include/linux/platform_data/dma-imx-sdma.h
diff --git a/arch/arm/plat-mxc/include/mach/dma.h b/include/linux/platform_data/dma-imx.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/dma.h
rename to include/linux/platform_data/dma-imx.h
diff --git a/arch/arm/plat-mxc/include/mach/i2c.h b/include/linux/platform_data/i2c-imx.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/i2c.h
rename to include/linux/platform_data/i2c-imx.h
diff --git a/arch/arm/plat-mxc/include/mach/esdhc.h b/include/linux/platform_data/mmc-esdhc-imx.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/esdhc.h
rename to include/linux/platform_data/mmc-esdhc-imx.h
diff --git a/arch/arm/plat-mxc/include/mach/mmc.h b/include/linux/platform_data/mmc-mxcmmc.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mmc.h
rename to include/linux/platform_data/mmc-mxcmmc.h
diff --git a/arch/arm/plat-mxc/include/mach/mxc_nand.h b/include/linux/platform_data/mtd-mxc_nand.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mxc_nand.h
rename to include/linux/platform_data/mtd-mxc_nand.h
diff --git a/arch/arm/plat-mxc/include/mach/imx-uart.h b/include/linux/platform_data/serial-imx.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/imx-uart.h
rename to include/linux/platform_data/serial-imx.h
diff --git a/arch/arm/plat-mxc/include/mach/spi.h b/include/linux/platform_data/spi-imx.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/spi.h
rename to include/linux/platform_data/spi-imx.h
diff --git a/arch/arm/plat-mxc/include/mach/mxc_ehci.h b/include/linux/platform_data/usb-ehci-mxc.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mxc_ehci.h
rename to include/linux/platform_data/usb-ehci-mxc.h
diff --git a/arch/arm/plat-mxc/include/mach/usb.h b/include/linux/platform_data/usb-imx_udc.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/usb.h
rename to include/linux/platform_data/usb-imx_udc.h
diff --git a/arch/arm/plat-mxc/include/mach/mx21-usbhost.h b/include/linux/platform_data/usb-mx2.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mx21-usbhost.h
rename to include/linux/platform_data/usb-mx2.h
diff --git a/arch/arm/plat-mxc/include/mach/imxfb.h b/include/linux/platform_data/video-imxfb.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/imxfb.h
rename to include/linux/platform_data/video-imxfb.h
diff --git a/arch/arm/plat-mxc/include/mach/mx3fb.h b/include/linux/platform_data/video-mx3fb.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mx3fb.h
rename to include/linux/platform_data/video-mx3fb.h
diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c
index 48f9d88..89a7755 100644
--- a/sound/soc/fsl/imx-pcm-dma.c
+++ b/sound/soc/fsl/imx-pcm-dma.c
@@ -30,7 +30,7 @@
#include <sound/soc.h>
#include <sound/dmaengine_pcm.h>
-#include <mach/dma.h>
+#include <linux/platform_data/dma-imx.h>
#include "imx-pcm.h"
diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c
index ee27ba3..22c6130 100644
--- a/sound/soc/fsl/imx-pcm-fiq.c
+++ b/sound/soc/fsl/imx-pcm-fiq.c
@@ -30,7 +30,7 @@
#include <asm/fiq.h>
#include <mach/irqs.h>
-#include <mach/ssi.h>
+#include <linux/platform_data/asoc-imx-ssi.h>
#include "imx-ssi.h"
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index 81d7728..e6a17ba 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -47,7 +47,7 @@
#include <sound/pcm_params.h>
#include <sound/soc.h>
-#include <mach/ssi.h>
+#include <linux/platform_data/asoc-imx-ssi.h>
#include <mach/hardware.h>
#include "imx-ssi.h"
diff --git a/sound/soc/fsl/imx-ssi.h b/sound/soc/fsl/imx-ssi.h
index 5744e86..dc114bd 100644
--- a/sound/soc/fsl/imx-ssi.h
+++ b/sound/soc/fsl/imx-ssi.h
@@ -186,7 +186,7 @@
#define DRV_NAME "imx-ssi"
#include <linux/dmaengine.h>
-#include <mach/dma.h>
+#include <linux/platform_data/dma-imx.h>
#include "imx-pcm.h"
struct imx_ssi {
--
1.7.10
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 05/16] ARM: msm: move platform_data definitions
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
` (2 preceding siblings ...)
2012-09-11 12:59 ` [PATCH 04/16] ARM: imx: " Arnd Bergmann
@ 2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 21:07 ` David Brown
2012-09-11 12:59 ` [PATCH 06/16] ARM: netx: " Arnd Bergmann
` (9 subsequent siblings)
13 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 12:59 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, David Brown,
Daniel Walker, Bryan Huntsman, Chris Ball,
Florian Tobias Schandinat, linux-arm-msm
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 msm include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: David Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Cc: Chris Ball <cjb@laptop.org>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: linux-arm-msm@vger.kernel.org
---
arch/arm/mach-msm/board-qsd8x50.c | 2 +-
arch/arm/mach-msm/board-trout-mmc.c | 2 +-
arch/arm/mach-msm/board-trout-panel.c | 2 +-
arch/arm/mach-msm/devices-msm7x00.c | 2 +-
arch/arm/mach-msm/devices-msm7x30.c | 2 +-
arch/arm/mach-msm/devices-qsd8x50.c | 2 +-
arch/arm/mach-msm/include/mach/board.h | 2 +-
drivers/mmc/host/msm_sdcc.c | 2 +-
drivers/video/msm/mddi.c | 2 +-
drivers/video/msm/mddi_client_dummy.c | 2 +-
drivers/video/msm/mddi_client_nt35399.c | 2 +-
drivers/video/msm/mddi_client_toshiba.c | 2 +-
drivers/video/msm/mdp.c | 2 +-
drivers/video/msm/mdp_hw.h | 2 +-
drivers/video/msm/mdp_ppp.c | 2 +-
drivers/video/msm/msm_fb.c | 2 +-
.../include/mach/mmc.h => include/linux/platform_data/mmc-msm_sdcc.h | 0
.../mach/msm_fb.h => include/linux/platform_data/video-msm_fb.h | 0
18 files changed, 16 insertions(+), 16 deletions(-)
rename arch/arm/mach-msm/include/mach/mmc.h => include/linux/platform_data/mmc-msm_sdcc.h (100%)
rename arch/arm/mach-msm/include/mach/msm_fb.h => include/linux/platform_data/video-msm_fb.h (100%)
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
index c8fe0ed..b21bb4c 100644
--- a/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@ -32,7 +32,7 @@
#include <mach/irqs.h>
#include <mach/sirc.h>
#include <mach/vreg.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-msm_sdcc.h>
#include "devices.h"
diff --git a/arch/arm/mach-msm/board-trout-mmc.c b/arch/arm/mach-msm/board-trout-mmc.c
index 8650342..3723e55 100644
--- a/arch/arm/mach-msm/board-trout-mmc.c
+++ b/arch/arm/mach-msm/board-trout-mmc.c
@@ -15,7 +15,7 @@
#include <mach/vreg.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-msm_sdcc.h>
#include "devices.h"
diff --git a/arch/arm/mach-msm/board-trout-panel.c b/arch/arm/mach-msm/board-trout-panel.c
index 89bf6b4..f9a5db6 100644
--- a/arch/arm/mach-msm/board-trout-panel.c
+++ b/arch/arm/mach-msm/board-trout-panel.c
@@ -14,7 +14,7 @@
#include <asm/mach-types.h>
#include <asm/system_info.h>
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
#include <mach/vreg.h>
#include "board-trout.h"
diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c
index 993780f..f66ee6e 100644
--- a/arch/arm/mach-msm/devices-msm7x00.c
+++ b/arch/arm/mach-msm/devices-msm7x00.c
@@ -27,7 +27,7 @@
#include "clock.h"
#include "clock-pcom.h"
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-msm_sdcc.h>
static struct resource resources_uart1[] = {
{
diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c
index 09b4f14..e90ab59 100644
--- a/arch/arm/mach-msm/devices-msm7x30.c
+++ b/arch/arm/mach-msm/devices-msm7x30.c
@@ -31,7 +31,7 @@
#include "clock-pcom.h"
#include "clock-7x30.h"
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-msm_sdcc.h>
static struct resource resources_uart2[] = {
{
diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
index 131633b..4db61d5 100644
--- a/arch/arm/mach-msm/devices-qsd8x50.c
+++ b/arch/arm/mach-msm/devices-qsd8x50.c
@@ -27,7 +27,7 @@
#include <asm/mach/flash.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-msm_sdcc.h>
#include "clock-pcom.h"
static struct resource resources_uart3[] = {
diff --git a/arch/arm/mach-msm/include/mach/board.h b/arch/arm/mach-msm/include/mach/board.h
index 435f8ed..70e0f98 100644
--- a/arch/arm/mach-msm/include/mach/board.h
+++ b/arch/arm/mach-msm/include/mach/board.h
@@ -18,7 +18,7 @@
#define __ASM_ARCH_MSM_BOARD_H
#include <linux/types.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-msm_sdcc.h>
/* platform device data structures */
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 1d14cda..7c0af0e 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -42,7 +42,7 @@
#include <asm/div64.h>
#include <asm/sizes.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-msm_sdcc.h>
#include <mach/msm_iomap.h>
#include <mach/dma.h>
#include <mach/clk.h>
diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c
index b061d70..bf73f04 100644
--- a/drivers/video/msm/mddi.c
+++ b/drivers/video/msm/mddi.c
@@ -29,7 +29,7 @@
#include <mach/msm_iomap.h>
#include <mach/irqs.h>
#include <mach/board.h>
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
#include "mddi_hw.h"
#define FLAG_DISABLE_HIBERNATION 0x0001
diff --git a/drivers/video/msm/mddi_client_dummy.c b/drivers/video/msm/mddi_client_dummy.c
index d2a091c..f1b0dfc 100644
--- a/drivers/video/msm/mddi_client_dummy.c
+++ b/drivers/video/msm/mddi_client_dummy.c
@@ -20,7 +20,7 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
struct panel_info {
struct platform_device pdev;
diff --git a/drivers/video/msm/mddi_client_nt35399.c b/drivers/video/msm/mddi_client_nt35399.c
index 7fcd67e..d7a5bf8 100644
--- a/drivers/video/msm/mddi_client_nt35399.c
+++ b/drivers/video/msm/mddi_client_nt35399.c
@@ -22,7 +22,7 @@
#include <linux/sched.h>
#include <linux/gpio.h>
#include <linux/slab.h>
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
static DECLARE_WAIT_QUEUE_HEAD(nt35399_vsync_wait);
diff --git a/drivers/video/msm/mddi_client_toshiba.c b/drivers/video/msm/mddi_client_toshiba.c
index 053eb68..061d7df 100644
--- a/drivers/video/msm/mddi_client_toshiba.c
+++ b/drivers/video/msm/mddi_client_toshiba.c
@@ -22,7 +22,7 @@
#include <linux/gpio.h>
#include <linux/sched.h>
#include <linux/slab.h>
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
#define LCD_CONTROL_BLOCK_BASE 0x110000
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index cb2ddf1..d1f881e 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -26,7 +26,7 @@
#include <linux/slab.h>
#include <mach/msm_iomap.h>
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
#include <linux/platform_device.h>
#include <linux/export.h>
diff --git a/drivers/video/msm/mdp_hw.h b/drivers/video/msm/mdp_hw.h
index d804774..a0bacf5 100644
--- a/drivers/video/msm/mdp_hw.h
+++ b/drivers/video/msm/mdp_hw.h
@@ -16,7 +16,7 @@
#define _MDP_HW_H_
#include <mach/msm_iomap.h>
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
struct mdp_info {
struct mdp_device mdp_dev;
diff --git a/drivers/video/msm/mdp_ppp.c b/drivers/video/msm/mdp_ppp.c
index 2b6564e..be6079c 100644
--- a/drivers/video/msm/mdp_ppp.c
+++ b/drivers/video/msm/mdp_ppp.c
@@ -16,7 +16,7 @@
#include <linux/file.h>
#include <linux/delay.h>
#include <linux/msm_mdp.h>
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
#include "mdp_hw.h"
#include "mdp_scale_tables.h"
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
index c6e3b4f..ec08a9e 100644
--- a/drivers/video/msm/msm_fb.c
+++ b/drivers/video/msm/msm_fb.c
@@ -25,7 +25,7 @@
#include <linux/msm_mdp.h>
#include <linux/io.h>
#include <linux/uaccess.h>
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
#include <mach/board.h>
#include <linux/workqueue.h>
#include <linux/clk.h>
diff --git a/arch/arm/mach-msm/include/mach/mmc.h b/include/linux/platform_data/mmc-msm_sdcc.h
similarity index 100%
rename from arch/arm/mach-msm/include/mach/mmc.h
rename to include/linux/platform_data/mmc-msm_sdcc.h
diff --git a/arch/arm/mach-msm/include/mach/msm_fb.h b/include/linux/platform_data/video-msm_fb.h
similarity index 100%
rename from arch/arm/mach-msm/include/mach/msm_fb.h
rename to include/linux/platform_data/video-msm_fb.h
--
1.7.10
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 06/16] ARM: netx: move platform_data definitions
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
` (3 preceding siblings ...)
2012-09-11 12:59 ` [PATCH 05/16] ARM: msm: " Arnd Bergmann
@ 2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 13:35 ` Sascha Hauer
2012-09-11 12:59 ` [PATCH 08/16] ARM: sa1100: " Arnd Bergmann
` (8 subsequent siblings)
13 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 12:59 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, David S. Miller,
netdev, Sascha Hauer
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 netx include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-netx/nxdb500.c | 2 +-
arch/arm/mach-netx/nxdkn.c | 2 +-
arch/arm/mach-netx/nxeb500hmi.c | 2 +-
drivers/net/ethernet/netx-eth.c | 2 +-
.../include/mach/eth.h => include/linux/platform_data/eth-netx.h | 0
5 files changed, 4 insertions(+), 4 deletions(-)
rename arch/arm/mach-netx/include/mach/eth.h => include/linux/platform_data/eth-netx.h (100%)
diff --git a/arch/arm/mach-netx/nxdb500.c b/arch/arm/mach-netx/nxdb500.c
index 180ea89..8b781ff 100644
--- a/arch/arm/mach-netx/nxdb500.c
+++ b/arch/arm/mach-netx/nxdb500.c
@@ -30,7 +30,7 @@
#include <asm/mach/arch.h>
#include <asm/hardware/vic.h>
#include <mach/netx-regs.h>
-#include <mach/eth.h>
+#include <linux/platform_data/eth-netx.h>
#include "generic.h"
#include "fb.h"
diff --git a/arch/arm/mach-netx/nxdkn.c b/arch/arm/mach-netx/nxdkn.c
index 58009e2..b26dbce 100644
--- a/arch/arm/mach-netx/nxdkn.c
+++ b/arch/arm/mach-netx/nxdkn.c
@@ -30,7 +30,7 @@
#include <asm/mach/arch.h>
#include <asm/hardware/vic.h>
#include <mach/netx-regs.h>
-#include <mach/eth.h>
+#include <linux/platform_data/eth-netx.h>
#include "generic.h"
diff --git a/arch/arm/mach-netx/nxeb500hmi.c b/arch/arm/mach-netx/nxeb500hmi.c
index 122e998..257382e 100644
--- a/arch/arm/mach-netx/nxeb500hmi.c
+++ b/arch/arm/mach-netx/nxeb500hmi.c
@@ -30,7 +30,7 @@
#include <asm/mach/arch.h>
#include <asm/hardware/vic.h>
#include <mach/netx-regs.h>
-#include <mach/eth.h>
+#include <linux/platform_data/eth-netx.h>
#include "generic.h"
#include "fb.h"
diff --git a/drivers/net/ethernet/netx-eth.c b/drivers/net/ethernet/netx-eth.c
index 9d11ab7..63e7af4 100644
--- a/drivers/net/ethernet/netx-eth.c
+++ b/drivers/net/ethernet/netx-eth.c
@@ -34,7 +34,7 @@
#include <mach/netx-regs.h>
#include <mach/pfifo.h>
#include <mach/xc.h>
-#include <mach/eth.h>
+#include <linux/platform_data/eth-netx.h>
/* XC Fifo Offsets */
#define EMPTY_PTR_FIFO(xcno) (0 + ((xcno) << 3)) /* Index of the empty pointer FIFO */
diff --git a/arch/arm/mach-netx/include/mach/eth.h b/include/linux/platform_data/eth-netx.h
similarity index 100%
rename from arch/arm/mach-netx/include/mach/eth.h
rename to include/linux/platform_data/eth-netx.h
--
1.7.10
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 08/16] ARM: sa1100: move platform_data definitions
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
` (4 preceding siblings ...)
2012-09-11 12:59 ` [PATCH 06/16] ARM: netx: " Arnd Bergmann
@ 2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 12:59 ` [PATCH 09/16] ARM: tegra: " Arnd Bergmann
` (7 subsequent siblings)
13 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 12:59 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, Samuel Ortiz,
Jochen Friedrich
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 sa1100 include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Jochen Friedrich <jochen@scram.de>
---
arch/arm/mach-sa1100/assabet.c | 2 +-
arch/arm/mach-sa1100/cerf.c | 2 +-
arch/arm/mach-sa1100/collie.c | 2 +-
arch/arm/mach-sa1100/lart.c | 2 +-
arch/arm/mach-sa1100/shannon.c | 2 +-
arch/arm/mach-sa1100/simpad.c | 2 +-
drivers/mfd/mcp-sa11x0.c | 2 +-
.../mach/mcp.h => include/linux/platform_data/mfd-mcp-sa11x0.h | 0
8 files changed, 7 insertions(+), 7 deletions(-)
rename arch/arm/mach-sa1100/include/mach/mcp.h => include/linux/platform_data/mfd-mcp-sa11x0.h (100%)
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index d673211..ba49241 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -37,7 +37,7 @@
#include <asm/mach/map.h>
#include <asm/mach/serial_sa1100.h>
#include <mach/assabet.h>
-#include <mach/mcp.h>
+#include <linux/platform_data/mfd-mcp-sa11x0.h>
#include <mach/irqs.h>
#include "generic.h"
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c
index 09d7f4b..985d0b5 100644
--- a/arch/arm/mach-sa1100/cerf.c
+++ b/arch/arm/mach-sa1100/cerf.c
@@ -28,7 +28,7 @@
#include <asm/mach/serial_sa1100.h>
#include <mach/cerf.h>
-#include <mach/mcp.h>
+#include <linux/platform_data/mfd-mcp-sa11x0.h>
#include <mach/irqs.h>
#include "generic.h"
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index ea5cff3..170cb61 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -45,7 +45,7 @@
#include <asm/hardware/scoop.h>
#include <asm/mach/sharpsl_param.h>
#include <asm/hardware/locomo.h>
-#include <mach/mcp.h>
+#include <linux/platform_data/mfd-mcp-sa11x0.h>
#include <mach/irqs.h>
#include "generic.h"
diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c
index b775a0a..7dc1a89 100644
--- a/arch/arm/mach-sa1100/lart.c
+++ b/arch/arm/mach-sa1100/lart.c
@@ -16,7 +16,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/serial_sa1100.h>
-#include <mach/mcp.h>
+#include <linux/platform_data/mfd-mcp-sa11x0.h>
#include <mach/irqs.h>
#include "generic.h"
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c
index 5d33fc3..ff6b7b3 100644
--- a/arch/arm/mach-sa1100/shannon.c
+++ b/arch/arm/mach-sa1100/shannon.c
@@ -19,7 +19,7 @@
#include <asm/mach/flash.h>
#include <asm/mach/map.h>
#include <asm/mach/serial_sa1100.h>
-#include <mach/mcp.h>
+#include <linux/platform_data/mfd-mcp-sa11x0.h>
#include <mach/shannon.h>
#include <mach/irqs.h>
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
index fbd5359..c73e1a3 100644
--- a/arch/arm/mach-sa1100/simpad.c
+++ b/arch/arm/mach-sa1100/simpad.c
@@ -24,7 +24,7 @@
#include <asm/mach/flash.h>
#include <asm/mach/map.h>
#include <asm/mach/serial_sa1100.h>
-#include <mach/mcp.h>
+#include <linux/platform_data/mfd-mcp-sa11x0.h>
#include <mach/simpad.h>
#include <mach/irqs.h>
diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c
index c54e244..f99d629 100644
--- a/drivers/mfd/mcp-sa11x0.c
+++ b/drivers/mfd/mcp-sa11x0.c
@@ -24,7 +24,7 @@
#include <mach/hardware.h>
#include <asm/mach-types.h>
-#include <mach/mcp.h>
+#include <linux/platform_data/mfd-mcp-sa11x0.h>
#define DRIVER_NAME "sa11x0-mcp"
diff --git a/arch/arm/mach-sa1100/include/mach/mcp.h b/include/linux/platform_data/mfd-mcp-sa11x0.h
similarity index 100%
rename from arch/arm/mach-sa1100/include/mach/mcp.h
rename to include/linux/platform_data/mfd-mcp-sa11x0.h
--
1.7.10
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 09/16] ARM: tegra: move platform_data definitions
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
` (5 preceding siblings ...)
2012-09-11 12:59 ` [PATCH 08/16] ARM: sa1100: " Arnd Bergmann
@ 2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 15:35 ` Stephen Warren
2012-09-11 15:42 ` Chris Ball
2012-09-11 12:59 ` [PATCH 10/16] ARM: vt8500: " Arnd Bergmann
` (6 subsequent siblings)
13 siblings, 2 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 12:59 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, Colin Cross,
Olof Johansson, Stephen Warren, Dmitry Torokhov, Chris Ball,
Liam Girdwood, Mark Brown, linux-tegra
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 tegra include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Colin Cross <ccross@android.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Chris Ball <cjb@laptop.org>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: linux-tegra@vger.kernel.org
---
arch/arm/mach-tegra/board-harmony.c | 4 ++--
arch/arm/mach-tegra/board-paz00.c | 2 +-
arch/arm/mach-tegra/board-trimslice.c | 2 +-
drivers/input/keyboard/tegra-kbc.c | 2 +-
drivers/mmc/host/sdhci-tegra.c | 2 +-
.../linux/platform_data/asoc-tegra_wm8903.h | 0
.../mach/kbc.h => include/linux/platform_data/keyboard-tegra-kbc.h | 0
.../mach/sdhci.h => include/linux/platform_data/mmc-sdhci-tegra.h | 0
sound/soc/tegra/tegra_wm8903.c | 2 +-
9 files changed, 7 insertions(+), 7 deletions(-)
rename arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h => include/linux/platform_data/asoc-tegra_wm8903.h (100%)
rename arch/arm/mach-tegra/include/mach/kbc.h => include/linux/platform_data/keyboard-tegra-kbc.h (100%)
rename arch/arm/mach-tegra/include/mach/sdhci.h => include/linux/platform_data/mmc-sdhci-tegra.h (100%)
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index e65e837..31b3b72 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@ -35,10 +35,10 @@
#include <asm/hardware/gic.h>
#include <asm/setup.h>
-#include <mach/tegra_wm8903_pdata.h>
+#include <linux/platform_data/asoc-tegra_wm8903.h>
#include <mach/iomap.h>
#include <mach/irqs.h>
-#include <mach/sdhci.h>
+#include <linux/platform_data/mmc-sdhci-tegra.h>
#include "board.h"
#include "board-harmony.h"
diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c
index 4b64af5..6dd6854 100644
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@ -40,7 +40,7 @@
#include <mach/iomap.h>
#include <mach/irqs.h>
-#include <mach/sdhci.h>
+#include <linux/platform_data/mmc-sdhci-tegra.h>
#include "board.h"
#include "board-paz00.h"
diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c
index 776aa95..fb80c8f 100644
--- a/arch/arm/mach-tegra/board-trimslice.c
+++ b/arch/arm/mach-tegra/board-trimslice.c
@@ -34,7 +34,7 @@
#include <asm/setup.h>
#include <mach/iomap.h>
-#include <mach/sdhci.h>
+#include <linux/platform_data/mmc-sdhci-tegra.h>
#include "board.h"
#include "clock.h"
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index 2c1c9ed..40aded8 100644
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -30,7 +30,7 @@
#include <linux/clk.h>
#include <linux/slab.h>
#include <mach/clk.h>
-#include <mach/kbc.h>
+#include <linux/platform_data/keyboard-tegra-kbc.h>
#define KBC_MAX_DEBOUNCE_CNT 0x3ffu
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index 0810ccc..d43e746 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -28,7 +28,7 @@
#include <asm/gpio.h>
#include <mach/gpio-tegra.h>
-#include <mach/sdhci.h>
+#include <linux/platform_data/mmc-sdhci-tegra.h>
#include "sdhci-pltfm.h"
diff --git a/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h b/include/linux/platform_data/asoc-tegra_wm8903.h
similarity index 100%
rename from arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
rename to include/linux/platform_data/asoc-tegra_wm8903.h
diff --git a/arch/arm/mach-tegra/include/mach/kbc.h b/include/linux/platform_data/keyboard-tegra-kbc.h
similarity index 100%
rename from arch/arm/mach-tegra/include/mach/kbc.h
rename to include/linux/platform_data/keyboard-tegra-kbc.h
diff --git a/arch/arm/mach-tegra/include/mach/sdhci.h b/include/linux/platform_data/mmc-sdhci-tegra.h
similarity index 100%
rename from arch/arm/mach-tegra/include/mach/sdhci.h
rename to include/linux/platform_data/mmc-sdhci-tegra.h
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index d4f14e4..8deedf5 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -34,7 +34,7 @@
#include <linux/gpio.h>
#include <linux/of_gpio.h>
-#include <mach/tegra_wm8903_pdata.h>
+#include <linux/platform_data/asoc-tegra_wm8903.h>
#include <sound/core.h>
#include <sound/jack.h>
--
1.7.10
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 10/16] ARM: vt8500: move platform_data definitions
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
` (6 preceding siblings ...)
2012-09-11 12:59 ` [PATCH 09/16] ARM: tegra: " Arnd Bergmann
@ 2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 20:54 ` Tony Prisk
2012-09-11 12:59 ` [PATCH 11/16] ARM: w90x900: " Arnd Bergmann
` (5 subsequent siblings)
13 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 12:59 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, Tony Prisk,
Florian Tobias Schandinat
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 vt8500 include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Tony Prisk <linux@prisktech.co.nz>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
---
arch/arm/mach-vt8500/devices.c | 2 +-
drivers/video/vt8500lcdfb.c | 2 +-
drivers/video/wm8505fb.c | 2 +-
.../vt8500fb.h => include/linux/platform_data/video-vt8500lcdfb.h | 0
4 files changed, 3 insertions(+), 3 deletions(-)
rename arch/arm/mach-vt8500/include/mach/vt8500fb.h => include/linux/platform_data/video-vt8500lcdfb.h (100%)
diff --git a/arch/arm/mach-vt8500/devices.c b/arch/arm/mach-vt8500/devices.c
index 1fcdc36..82b4bce 100644
--- a/arch/arm/mach-vt8500/devices.c
+++ b/arch/arm/mach-vt8500/devices.c
@@ -23,7 +23,7 @@
#include <asm/mach/arch.h>
-#include <mach/vt8500fb.h>
+#include <linux/platform_data/video-vt8500lcdfb.h>
#include <mach/i8042.h>
#include "devices.h"
diff --git a/drivers/video/vt8500lcdfb.c b/drivers/video/vt8500lcdfb.c
index 2a5fe6e..66a74f9 100644
--- a/drivers/video/vt8500lcdfb.c
+++ b/drivers/video/vt8500lcdfb.c
@@ -30,7 +30,7 @@
#include <linux/platform_device.h>
#include <linux/wait.h>
-#include <mach/vt8500fb.h>
+#include <linux/platform_data/video-vt8500lcdfb.h>
#include "vt8500lcdfb.h"
#include "wmt_ge_rops.h"
diff --git a/drivers/video/wm8505fb.c b/drivers/video/wm8505fb.c
index c8703bd..ffeff48 100644
--- a/drivers/video/wm8505fb.c
+++ b/drivers/video/wm8505fb.c
@@ -29,7 +29,7 @@
#include <linux/platform_device.h>
#include <linux/wait.h>
-#include <mach/vt8500fb.h>
+#include <linux/platform_data/video-vt8500lcdfb.h>
#include "wm8505fb_regs.h"
#include "wmt_ge_rops.h"
diff --git a/arch/arm/mach-vt8500/include/mach/vt8500fb.h b/include/linux/platform_data/video-vt8500lcdfb.h
similarity index 100%
rename from arch/arm/mach-vt8500/include/mach/vt8500fb.h
rename to include/linux/platform_data/video-vt8500lcdfb.h
--
1.7.10
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 11/16] ARM: w90x900: move platform_data definitions
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
` (7 preceding siblings ...)
2012-09-11 12:59 ` [PATCH 10/16] ARM: vt8500: " Arnd Bergmann
@ 2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 12:59 ` [PATCH 12/16] ARM: nomadik: " Arnd Bergmann
` (4 subsequent siblings)
13 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 12:59 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, Wan ZongShun,
Ben Dooks (embedded platforms), Wolfram Sang (embedded platforms),
Dmitry Torokhov, Grant Likely, Florian Tobias Schandinat,
Mark Brown
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 w90x900 include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
arch/arm/mach-w90x900/dev.c | 6 +++---
arch/arm/mach-w90x900/mach-nuc950evb.c | 2 +-
drivers/i2c/busses/i2c-nuc900.c | 2 +-
drivers/input/keyboard/w90p910_keypad.c | 2 +-
drivers/spi/spi-nuc900.c | 2 +-
drivers/video/nuc900fb.c | 2 +-
drivers/video/nuc900fb.h | 2 +-
.../mach/i2c.h => include/linux/platform_data/i2c-nuc900.h | 0
.../linux/platform_data/keypad-w90p910.h | 0
.../nuc900_spi.h => include/linux/platform_data/spi-nuc900.h | 0
.../mach/fb.h => include/linux/platform_data/video-nuc900fb.h | 0
11 files changed, 9 insertions(+), 9 deletions(-)
rename arch/arm/mach-w90x900/include/mach/i2c.h => include/linux/platform_data/i2c-nuc900.h (100%)
rename arch/arm/mach-w90x900/include/mach/w90p910_keypad.h => include/linux/platform_data/keypad-w90p910.h (100%)
rename arch/arm/mach-w90x900/include/mach/nuc900_spi.h => include/linux/platform_data/spi-nuc900.h (100%)
rename arch/arm/mach-w90x900/include/mach/fb.h => include/linux/platform_data/video-nuc900fb.h (100%)
diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c
index 48f5b9f..7abdb96 100644
--- a/arch/arm/mach-w90x900/dev.c
+++ b/arch/arm/mach-w90x900/dev.c
@@ -34,11 +34,11 @@
#include <asm/mach-types.h>
#include <mach/regs-serial.h>
-#include <mach/nuc900_spi.h>
+#include <linux/platform_data/spi-nuc900.h>
#include <mach/map.h>
-#include <mach/fb.h>
+#include <linux/platform_data/video-nuc900fb.h>
#include <mach/regs-ldm.h>
-#include <mach/w90p910_keypad.h>
+#include <linux/platform_data/keypad-w90p910.h>
#include "cpu.h"
diff --git a/arch/arm/mach-w90x900/mach-nuc950evb.c b/arch/arm/mach-w90x900/mach-nuc950evb.c
index 067d8f9..500fe59 100644
--- a/arch/arm/mach-w90x900/mach-nuc950evb.c
+++ b/arch/arm/mach-w90x900/mach-nuc950evb.c
@@ -20,7 +20,7 @@
#include <asm/mach/map.h>
#include <asm/mach-types.h>
#include <mach/map.h>
-#include <mach/fb.h>
+#include <linux/platform_data/video-nuc900fb.h>
#include "nuc950.h"
diff --git a/drivers/i2c/busses/i2c-nuc900.c b/drivers/i2c/busses/i2c-nuc900.c
index a26dfb8..f41502e 100644
--- a/drivers/i2c/busses/i2c-nuc900.c
+++ b/drivers/i2c/busses/i2c-nuc900.c
@@ -29,7 +29,7 @@
#include <linux/io.h>
#include <mach/mfp.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-nuc900.h>
/* nuc900 i2c registers offset */
diff --git a/drivers/input/keyboard/w90p910_keypad.c b/drivers/input/keyboard/w90p910_keypad.c
index 085ede4..e0f6cd1 100644
--- a/drivers/input/keyboard/w90p910_keypad.c
+++ b/drivers/input/keyboard/w90p910_keypad.c
@@ -21,7 +21,7 @@
#include <linux/io.h>
#include <linux/slab.h>
-#include <mach/w90p910_keypad.h>
+#include <linux/platform_data/keypad-w90p910.h>
/* Keypad Interface Control Registers */
#define KPI_CONF 0x00
diff --git a/drivers/spi/spi-nuc900.c b/drivers/spi/spi-nuc900.c
index dae8be2..a6eca6f 100644
--- a/drivers/spi/spi-nuc900.c
+++ b/drivers/spi/spi-nuc900.c
@@ -26,7 +26,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/spi_bitbang.h>
-#include <mach/nuc900_spi.h>
+#include <linux/platform_data/spi-nuc900.h>
/* usi registers offset */
#define USI_CNT 0x00
diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c
index e10f551..9338755 100644
--- a/drivers/video/nuc900fb.c
+++ b/drivers/video/nuc900fb.c
@@ -38,7 +38,7 @@
#include <mach/map.h>
#include <mach/regs-clock.h>
#include <mach/regs-ldm.h>
-#include <mach/fb.h>
+#include <linux/platform_data/video-nuc900fb.h>
#include "nuc900fb.h"
diff --git a/drivers/video/nuc900fb.h b/drivers/video/nuc900fb.h
index bc7c930..9a1ca6d 100644
--- a/drivers/video/nuc900fb.h
+++ b/drivers/video/nuc900fb.h
@@ -16,7 +16,7 @@
#define __NUC900FB_H
#include <mach/map.h>
-#include <mach/fb.h>
+#include <linux/platform_data/video-nuc900fb.h>
enum nuc900_lcddrv_type {
LCDDRV_NUC910,
diff --git a/arch/arm/mach-w90x900/include/mach/i2c.h b/include/linux/platform_data/i2c-nuc900.h
similarity index 100%
rename from arch/arm/mach-w90x900/include/mach/i2c.h
rename to include/linux/platform_data/i2c-nuc900.h
diff --git a/arch/arm/mach-w90x900/include/mach/w90p910_keypad.h b/include/linux/platform_data/keypad-w90p910.h
similarity index 100%
rename from arch/arm/mach-w90x900/include/mach/w90p910_keypad.h
rename to include/linux/platform_data/keypad-w90p910.h
diff --git a/arch/arm/mach-w90x900/include/mach/nuc900_spi.h b/include/linux/platform_data/spi-nuc900.h
similarity index 100%
rename from arch/arm/mach-w90x900/include/mach/nuc900_spi.h
rename to include/linux/platform_data/spi-nuc900.h
diff --git a/arch/arm/mach-w90x900/include/mach/fb.h b/include/linux/platform_data/video-nuc900fb.h
similarity index 100%
rename from arch/arm/mach-w90x900/include/mach/fb.h
rename to include/linux/platform_data/video-nuc900fb.h
--
1.7.10
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 12/16] ARM: nomadik: move platform_data definitions
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
` (8 preceding siblings ...)
2012-09-11 12:59 ` [PATCH 11/16] ARM: w90x900: " Arnd Bergmann
@ 2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 13:07 ` Felipe Balbi
2012-09-11 13:31 ` Linus Walleij
2012-09-11 12:59 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
` (3 subsequent siblings)
13 siblings, 2 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 12:59 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, Alessandro Rubini,
Linus Walleij, STEricsson, Srinidhi Kasagar, Herbert Xu,
David S. Miller, Dmitry Torokhov, David Woodhouse, Felipe Balbi,
Greg Kroah-Hartman, Andreas Westin
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 nomadik include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Alessandro Rubini <rubini@unipv.it>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: STEricsson <STEricsson_nomadik_linux@list.st.com>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andreas Westin <andreas.westin@stericsson.com>
---
arch/arm/mach-nomadik/board-nhk8815.c | 2 +-
arch/arm/mach-u300/core.c | 2 +-
arch/arm/mach-ux500/board-mop500.c | 2 +-
arch/arm/mach-ux500/cpu-db8500.c | 2 +-
arch/arm/mach-ux500/devices-common.h | 2 +-
arch/arm/mach-ux500/usb.c | 2 +-
drivers/crypto/ux500/cryp/cryp_core.c | 2 +-
drivers/crypto/ux500/hash/hash_core.c | 2 +-
drivers/input/keyboard/nomadik-ske-keypad.c | 2 +-
drivers/mtd/nand/nomadik_nand.c | 2 +-
drivers/pinctrl/pinctrl-coh901.c | 2 +-
drivers/usb/musb/ux500_dma.c | 2 +-
.../include/mach => include/linux/platform_data}/crypto-ux500.h | 0
.../plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h | 0
.../mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h | 0
.../mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h | 0
.../mach/usb.h => include/linux/platform_data/usb-musb-ux500.h | 0
17 files changed, 12 insertions(+), 12 deletions(-)
rename {arch/arm/mach-ux500/include/mach => include/linux/platform_data}/crypto-ux500.h (100%)
rename arch/arm/plat-nomadik/include/plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h (100%)
rename arch/arm/mach-nomadik/include/mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h (100%)
rename arch/arm/mach-u300/include/mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h (100%)
rename arch/arm/mach-ux500/include/mach/usb.h => include/linux/platform_data/usb-musb-ux500.h (100%)
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c
index f4535a7..381c080 100644
--- a/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@ -34,7 +34,7 @@
#include <plat/gpio-nomadik.h>
#include <plat/mtu.h>
-#include <mach/nand.h>
+#include <linux/platform_data/mtd-nomadik-nand.h>
#include <mach/fsmc.h>
#include "cpu-8815.h"
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 03acf18..62adfe7 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -43,7 +43,7 @@
#include <mach/hardware.h>
#include <mach/syscon.h>
#include <mach/dma_channels.h>
-#include <mach/gpio-u300.h>
+#include <linux/platform_data/pinctrl-coh901.h>
#include "spi.h"
#include "i2c.h"
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 8674a89..38854d4 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -48,7 +48,7 @@
#include <mach/setup.h>
#include <mach/devices.h>
#include <mach/irqs.h>
-#include <mach/crypto-ux500.h>
+#include <linux/platform_data/crypto-ux500.h>
#include "ste-dma40-db8500.h"
#include "devices-db8500.h"
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index db3c52d..1bef4c3 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -24,7 +24,7 @@
#include <mach/hardware.h>
#include <mach/setup.h>
#include <mach/devices.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-musb-ux500.h>
#include <mach/db8500-regs.h>
#include "devices-db8500.h"
diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h
index ecdd838..7fbf0ba 100644
--- a/arch/arm/mach-ux500/devices-common.h
+++ b/arch/arm/mach-ux500/devices-common.h
@@ -13,7 +13,7 @@
#include <linux/sys_soc.h>
#include <linux/amba/bus.h>
#include <linux/platform_data/i2c-nomadik.h>
-#include <mach/crypto-ux500.h>
+#include <linux/platform_data/crypto-ux500.h>
struct spi_master_cntlr;
diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c
index a74af38..145482e 100644
--- a/arch/arm/mach-ux500/usb.c
+++ b/arch/arm/mach-ux500/usb.c
@@ -10,7 +10,7 @@
#include <plat/ste_dma40.h>
#include <mach/hardware.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-musb-ux500.h>
#define MUSB_DMA40_RX_CH { \
.mode = STEDMA40_MODE_LOGICAL, \
diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c
index 1c307e1..ef17e38 100644
--- a/drivers/crypto/ux500/cryp/cryp_core.c
+++ b/drivers/crypto/ux500/cryp/cryp_core.c
@@ -32,7 +32,7 @@
#include <plat/ste_dma40.h>
-#include <mach/crypto-ux500.h>
+#include <linux/platform_data/crypto-ux500.h>
#include <mach/hardware.h>
#include "cryp_p.h"
diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
index 08d5032..0876507 100644
--- a/drivers/crypto/ux500/hash/hash_core.c
+++ b/drivers/crypto/ux500/hash/hash_core.c
@@ -31,7 +31,7 @@
#include <crypto/scatterwalk.h>
#include <crypto/algapi.h>
-#include <mach/crypto-ux500.h>
+#include <linux/platform_data/crypto-ux500.h>
#include <mach/hardware.h>
#include "hash_alg.h"
diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c
index a880e74..49f5fa6 100644
--- a/drivers/input/keyboard/nomadik-ske-keypad.c
+++ b/drivers/input/keyboard/nomadik-ske-keypad.c
@@ -20,7 +20,7 @@
#include <linux/clk.h>
#include <linux/module.h>
-#include <plat/ske.h>
+#include <linux/platform_data/keypad-nomadik-ske.h>
/* SKE_CR bits */
#define SKE_KPMLT (0x1 << 6)
diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c
index a86aa81..9ee0c4e 100644
--- a/drivers/mtd/nand/nomadik_nand.c
+++ b/drivers/mtd/nand/nomadik_nand.c
@@ -31,7 +31,7 @@
#include <linux/mtd/partitions.h>
#include <linux/io.h>
#include <linux/slab.h>
-#include <mach/nand.h>
+#include <linux/platform_data/mtd-nomadik-nand.h>
#include <mach/fsmc.h>
#include <mtd/mtd-abi.h>
diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c
index cc0f00d..b7f41e9 100644
--- a/drivers/pinctrl/pinctrl-coh901.c
+++ b/drivers/pinctrl/pinctrl-coh901.c
@@ -24,7 +24,7 @@
#include <linux/slab.h>
#include <linux/pinctrl/consumer.h>
#include <linux/pinctrl/pinconf-generic.h>
-#include <mach/gpio-u300.h>
+#include <linux/platform_data/pinctrl-coh901.h>
#include "pinctrl-coh901.h"
/*
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
index d05c7fb..f82246d 100644
--- a/drivers/usb/musb/ux500_dma.c
+++ b/drivers/usb/musb/ux500_dma.c
@@ -30,7 +30,7 @@
#include <linux/dma-mapping.h>
#include <linux/dmaengine.h>
#include <linux/pfn.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-musb-ux500.h>
#include "musb_core.h"
struct ux500_dma_channel {
diff --git a/arch/arm/mach-ux500/include/mach/crypto-ux500.h b/include/linux/platform_data/crypto-ux500.h
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/crypto-ux500.h
rename to include/linux/platform_data/crypto-ux500.h
diff --git a/arch/arm/plat-nomadik/include/plat/ske.h b/include/linux/platform_data/keypad-nomadik-ske.h
similarity index 100%
rename from arch/arm/plat-nomadik/include/plat/ske.h
rename to include/linux/platform_data/keypad-nomadik-ske.h
diff --git a/arch/arm/mach-nomadik/include/mach/nand.h b/include/linux/platform_data/mtd-nomadik-nand.h
similarity index 100%
rename from arch/arm/mach-nomadik/include/mach/nand.h
rename to include/linux/platform_data/mtd-nomadik-nand.h
diff --git a/arch/arm/mach-u300/include/mach/gpio-u300.h b/include/linux/platform_data/pinctrl-coh901.h
similarity index 100%
rename from arch/arm/mach-u300/include/mach/gpio-u300.h
rename to include/linux/platform_data/pinctrl-coh901.h
diff --git a/arch/arm/mach-ux500/include/mach/usb.h b/include/linux/platform_data/usb-musb-ux500.h
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/usb.h
rename to include/linux/platform_data/usb-musb-ux500.h
--
1.7.10
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 13/16] ARM: omap: move platform_data definitions
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
` (9 preceding siblings ...)
2012-09-11 12:59 ` [PATCH 12/16] ARM: nomadik: " Arnd Bergmann
@ 2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 13:52 ` Peter Ujfalusi
2012-09-12 7:16 ` Pihet-XID, Jean
2012-09-11 13:20 ` [PATCH 01/16] ARM: at91: " Jean-Christophe PLAGNIOL-VILLARD
` (2 subsequent siblings)
13 siblings, 2 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 12:59 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, Tony Lindgren,
Kevin Hilman, Benoît Cousson, Dmitry Torokhov,
David Woodhouse, Kyungmin Park, Ohad Ben-Cohen, Grant Likely,
Omar Ramirez Luna, Greg Kroah-Hartman, Tomi Valkeinen,
Florian Tobias Schandinat, Peter Ujfalusi, Jarkko Nikula,
Liam Girdwood, Mark Brown, Artem Bityutskiy, Jean Pihet,
J Keerthy, linux-omap
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%)
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>
--
1.7.10
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 13/16] ARM: omap: move platform_data definitions
2012-09-11 12:59 ` [PATCH 00/16] ARM: big platform data header rename Arnd Bergmann
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
@ 2012-09-11 13:02 ` Arnd Bergmann
2012-09-11 13:02 ` [PATCH 14/16] ARM: orion: " Arnd Bergmann
` (3 more replies)
1 sibling, 4 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 13:02 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, Tony Lindgren,
Kevin Hilman, Benoît Cousson, Dmitry Torokhov,
David Woodhouse, Kyungmin Park, Ohad Ben-Cohen, Grant Likely,
Omar Ramirez Luna, Greg Kroah-Hartman, Tomi Valkeinen,
Florian Tobias Schandinat, Peter Ujfalusi, Jarkko Nikula,
Liam Girdwood, Mark Brown, Artem Bityutskiy, Jean Pihet,
J Keerthy, linux-omap
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%)
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>
--
1.7.10
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 14/16] ARM: orion: move platform_data definitions
2012-09-11 13:02 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
@ 2012-09-11 13:02 ` Arnd Bergmann
2012-09-11 13:11 ` Thomas Petazzoni
2012-09-11 13:02 ` [PATCH 15/16] ARM: samsung: " Arnd Bergmann
` (2 subsequent siblings)
3 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 13:02 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, Jason Cooper,
Andrew Lunn, Vinod Koul, Dan Williams, Bryan Wu, Richard Purdie,
Nicolas Pitre, Chris Ball, David Woodhouse, Alan Stern,
Greg Kroah-Hartman, Liam Girdwood, Mark Brown, Jaroslav Kysela,
Takashi Iwai
Platform data for device drivers should be defined in
include/linux/platform_data/*.h, not in the architecture
and platform specific directories.
This moves such data out of the orion include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <djbw@fb.com>
Cc: Bryan Wu <bryan.wu@canonical.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Chris Ball <cjb@laptop.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
---
arch/arm/mach-dove/common.c | 2 +-
arch/arm/mach-kirkwood/board-dreamplug.c | 2 +-
arch/arm/mach-kirkwood/board-goflexnet.c | 2 +-
arch/arm/mach-kirkwood/common.c | 10 +++++-----
arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 +-
arch/arm/mach-kirkwood/dockstar-setup.c | 2 +-
arch/arm/mach-kirkwood/guruplug-setup.c | 2 +-
arch/arm/mach-kirkwood/netspace_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/netxbig_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/openrd-setup.c | 2 +-
arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +-
arch/arm/mach-kirkwood/sheevaplug-setup.c | 2 +-
arch/arm/mach-mv78xx0/common.c | 4 ++--
arch/arm/mach-orion5x/common.c | 4 ++--
arch/arm/mach-orion5x/db88f5281-setup.c | 2 +-
arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 +-
arch/arm/plat-orion/common.c | 4 ++--
drivers/dma/mv_xor.c | 2 +-
drivers/leds/leds-netxbig.c | 2 +-
drivers/leds/leds-ns2.c | 2 +-
drivers/mmc/host/mvsdio.c | 2 +-
drivers/mtd/nand/orion_nand.c | 2 +-
drivers/usb/host/ehci-orion.c | 2 +-
.../audio.h => include/linux/platform_data/asoc-kirkwood.h | 0
.../mv_xor.h => include/linux/platform_data/dma-mv_xor.h | 0
.../linux/platform_data/leds-kirkwood-netxbig.h | 0
.../linux/platform_data/leds-kirkwood-ns2.h | 0
.../mvsdio.h => include/linux/platform_data/mmc-mvsdio.h | 0
.../linux/platform_data/mtd-orion_nand.h | 0
.../linux/platform_data/usb-ehci-orion.h | 0
sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
sound/soc/kirkwood/kirkwood-openrd.c | 2 +-
sound/soc/kirkwood/kirkwood-t5325.c | 2 +-
34 files changed, 34 insertions(+), 34 deletions(-)
rename arch/arm/plat-orion/include/plat/audio.h => include/linux/platform_data/asoc-kirkwood.h (100%)
rename arch/arm/plat-orion/include/plat/mv_xor.h => include/linux/platform_data/dma-mv_xor.h (100%)
rename arch/arm/mach-kirkwood/include/mach/leds-netxbig.h => include/linux/platform_data/leds-kirkwood-netxbig.h (100%)
rename arch/arm/mach-kirkwood/include/mach/leds-ns2.h => include/linux/platform_data/leds-kirkwood-ns2.h (100%)
rename arch/arm/plat-orion/include/plat/mvsdio.h => include/linux/platform_data/mmc-mvsdio.h (100%)
rename arch/arm/plat-orion/include/plat/orion_nand.h => include/linux/platform_data/mtd-orion_nand.h (100%)
rename arch/arm/plat-orion/include/plat/ehci-orion.h => include/linux/platform_data/usb-ehci-orion.h (100%)
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index 4db5de5..29d63fa 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -28,7 +28,7 @@
#include <asm/mach/arch.h>
#include <linux/irq.h>
#include <plat/time.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/usb-ehci-orion.h>
#include <plat/common.h>
#include <plat/addr-map.h>
#include "common.h"
diff --git a/arch/arm/mach-kirkwood/board-dreamplug.c b/arch/arm/mach-kirkwood/board-dreamplug.c
index aeb234d..20af53a 100644
--- a/arch/arm/mach-kirkwood/board-dreamplug.c
+++ b/arch/arm/mach-kirkwood/board-dreamplug.c
@@ -30,7 +30,7 @@
#include <asm/mach/map.h>
#include <mach/kirkwood.h>
#include <mach/bridge-regs.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c
index 413e2c8..001ca8c 100644
--- a/arch/arm/mach-kirkwood/board-goflexnet.c
+++ b/arch/arm/mach-kirkwood/board-goflexnet.c
@@ -32,7 +32,7 @@
#include <asm/mach/map.h>
#include <mach/kirkwood.h>
#include <mach/bridge-regs.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index c4b64ad..bd5ea69 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -26,15 +26,15 @@
#include <asm/mach/time.h>
#include <mach/kirkwood.h>
#include <mach/bridge-regs.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-kirkwood.h>
#include <plat/cache-feroceon-l2.h>
-#include <plat/mvsdio.h>
-#include <plat/orion_nand.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/mmc-mvsdio.h>
+#include <linux/platform_data/mtd-orion_nand.h>
+#include <linux/platform_data/usb-ehci-orion.h>
#include <plat/common.h>
#include <plat/time.h>
#include <plat/addr-map.h>
-#include <plat/mv_xor.h>
+#include <linux/platform_data/dma-mv_xor.h>
#include "common.h"
/*****************************************************************************
diff --git a/arch/arm/mach-kirkwood/d2net_v2-setup.c b/arch/arm/mach-kirkwood/d2net_v2-setup.c
index 6e1bac9..2c1a453 100644
--- a/arch/arm/mach-kirkwood/d2net_v2-setup.c
+++ b/arch/arm/mach-kirkwood/d2net_v2-setup.c
@@ -32,7 +32,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/kirkwood.h>
-#include <mach/leds-ns2.h>
+#include <linux/platform_data/leds-kirkwood-ns2.h>
#include "common.h"
#include "mpp.h"
#include "lacie_v2-common.h"
diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
index d933593..044a631c 100644
--- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
+++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
@@ -17,7 +17,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
index 61d9a55..23dcb19 100644
--- a/arch/arm/mach-kirkwood/dockstar-setup.c
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c
@@ -19,7 +19,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
index bdaed38..7cb55f9 100644
--- a/arch/arm/mach-kirkwood/guruplug-setup.c
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c
@@ -19,7 +19,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c
index e6bba01..88b0788 100644
--- a/arch/arm/mach-kirkwood/netspace_v2-setup.c
+++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c
@@ -34,7 +34,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/kirkwood.h>
-#include <mach/leds-ns2.h>
+#include <linux/platform_data/leds-kirkwood-ns2.h>
#include "common.h"
#include "mpp.h"
#include "lacie_v2-common.h"
diff --git a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/netxbig_v2-setup.c
index 31ae8de..a3b0914 100644
--- a/arch/arm/mach-kirkwood/netxbig_v2-setup.c
+++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c
@@ -32,7 +32,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/kirkwood.h>
-#include <mach/leds-netxbig.h>
+#include <linux/platform_data/leds-kirkwood-netxbig.h>
#include "common.h"
#include "mpp.h"
#include "lacie_v2-common.h"
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
index 7e99c3f..134ef50 100644
--- a/arch/arm/mach-kirkwood/openrd-setup.c
+++ b/arch/arm/mach-kirkwood/openrd-setup.c
@@ -20,7 +20,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
index ef92207..9717101 100644
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@ -20,7 +20,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
index 4ea70e5f..28d0aba 100644
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
@@ -19,7 +19,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index b4c53b8..26de7f4 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -20,8 +20,8 @@
#include <mach/mv78xx0.h>
#include <mach/bridge-regs.h>
#include <plat/cache-feroceon-l2.h>
-#include <plat/ehci-orion.h>
-#include <plat/orion_nand.h>
+#include <linux/platform_data/usb-ehci-orion.h>
+#include <linux/platform_data/mtd-orion_nand.h>
#include <plat/time.h>
#include <plat/common.h>
#include <plat/addr-map.h>
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 9148b22..ca67e82 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -30,8 +30,8 @@
#include <mach/bridge-regs.h>
#include <mach/hardware.h>
#include <mach/orion5x.h>
-#include <plat/orion_nand.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/mtd-orion_nand.h>
+#include <linux/platform_data/usb-ehci-orion.h>
#include <plat/time.h>
#include <plat/common.h>
#include <plat/addr-map.h>
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index 49a3fd6..41fe2b1 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -24,7 +24,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <mach/orion5x.h>
-#include <plat/orion_nand.h>
+#include <linux/platform_data/mtd-orion_nand.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index 1e458ef..f1ae10a 100644
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -24,7 +24,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <mach/orion5x.h>
-#include <plat/orion_nand.h>
+#include <linux/platform_data/mtd-orion_nand.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index d245a87..9148eb0 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -19,8 +19,8 @@
#include <linux/mv643xx_eth.h>
#include <linux/mv643xx_i2c.h>
#include <net/dsa.h>
-#include <plat/mv_xor.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/dma-mv_xor.h>
+#include <linux/platform_data/usb-ehci-orion.h>
#include <mach/bridge-regs.h>
/* Create a clkdev entry for a given device/clk */
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index 0b12e68..e362e2b 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -26,7 +26,7 @@
#include <linux/platform_device.h>
#include <linux/memory.h>
#include <linux/clk.h>
-#include <plat/mv_xor.h>
+#include <linux/platform_data/dma-mv_xor.h>
#include "dmaengine.h"
#include "mv_xor.h"
diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c
index e37618e..461bbf9 100644
--- a/drivers/leds/leds-netxbig.c
+++ b/drivers/leds/leds-netxbig.c
@@ -28,7 +28,7 @@
#include <linux/platform_device.h>
#include <linux/gpio.h>
#include <linux/leds.h>
-#include <mach/leds-netxbig.h>
+#include <linux/platform_data/leds-kirkwood-netxbig.h>
/*
* GPIO extension bus.
diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
index 10528da..d176ec8 100644
--- a/drivers/leds/leds-ns2.c
+++ b/drivers/leds/leds-ns2.c
@@ -29,7 +29,7 @@
#include <linux/gpio.h>
#include <linux/leds.h>
#include <linux/module.h>
-#include <mach/leds-ns2.h>
+#include <linux/platform_data/leds-kirkwood-ns2.h>
/*
* The Network Space v2 dual-GPIO LED is wired to a CPLD and can blink in
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index a61cb5f..de4c20b 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -25,7 +25,7 @@
#include <asm/sizes.h>
#include <asm/unaligned.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
#include "mvsdio.h"
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index fc5a868..131b58a 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -22,7 +22,7 @@
#include <asm/io.h>
#include <asm/sizes.h>
#include <mach/hardware.h>
-#include <plat/orion_nand.h>
+#include <linux/platform_data/mtd-orion_nand.h>
static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
{
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index 8892d36..8e7eca6 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -13,7 +13,7 @@
#include <linux/platform_device.h>
#include <linux/mbus.h>
#include <linux/clk.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/usb-ehci-orion.h>
#define rdl(off) __raw_readl(hcd->regs + (off))
#define wrl(off, val) __raw_writel((val), hcd->regs + (off))
diff --git a/arch/arm/plat-orion/include/plat/audio.h b/include/linux/platform_data/asoc-kirkwood.h
similarity index 100%
rename from arch/arm/plat-orion/include/plat/audio.h
rename to include/linux/platform_data/asoc-kirkwood.h
diff --git a/arch/arm/plat-orion/include/plat/mv_xor.h b/include/linux/platform_data/dma-mv_xor.h
similarity index 100%
rename from arch/arm/plat-orion/include/plat/mv_xor.h
rename to include/linux/platform_data/dma-mv_xor.h
diff --git a/arch/arm/mach-kirkwood/include/mach/leds-netxbig.h b/include/linux/platform_data/leds-kirkwood-netxbig.h
similarity index 100%
rename from arch/arm/mach-kirkwood/include/mach/leds-netxbig.h
rename to include/linux/platform_data/leds-kirkwood-netxbig.h
diff --git a/arch/arm/mach-kirkwood/include/mach/leds-ns2.h b/include/linux/platform_data/leds-kirkwood-ns2.h
similarity index 100%
rename from arch/arm/mach-kirkwood/include/mach/leds-ns2.h
rename to include/linux/platform_data/leds-kirkwood-ns2.h
diff --git a/arch/arm/plat-orion/include/plat/mvsdio.h b/include/linux/platform_data/mmc-mvsdio.h
similarity index 100%
rename from arch/arm/plat-orion/include/plat/mvsdio.h
rename to include/linux/platform_data/mmc-mvsdio.h
diff --git a/arch/arm/plat-orion/include/plat/orion_nand.h b/include/linux/platform_data/mtd-orion_nand.h
similarity index 100%
rename from arch/arm/plat-orion/include/plat/orion_nand.h
rename to include/linux/platform_data/mtd-orion_nand.h
diff --git a/arch/arm/plat-orion/include/plat/ehci-orion.h b/include/linux/platform_data/usb-ehci-orion.h
similarity index 100%
rename from arch/arm/plat-orion/include/plat/ehci-orion.h
rename to include/linux/platform_data/usb-ehci-orion.h
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 7646dd7..542538d 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -21,7 +21,7 @@
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-kirkwood.h>
#include "kirkwood.h"
#define DRV_NAME "kirkwood-i2s"
diff --git a/sound/soc/kirkwood/kirkwood-openrd.c b/sound/soc/kirkwood/kirkwood-openrd.c
index 80bd59c..c28540a 100644
--- a/sound/soc/kirkwood/kirkwood-openrd.c
+++ b/sound/soc/kirkwood/kirkwood-openrd.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <sound/soc.h>
#include <mach/kirkwood.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-kirkwood.h>
#include <asm/mach-types.h>
#include "../codecs/cs42l51.h"
diff --git a/sound/soc/kirkwood/kirkwood-t5325.c b/sound/soc/kirkwood/kirkwood-t5325.c
index f898363..c67bbc5 100644
--- a/sound/soc/kirkwood/kirkwood-t5325.c
+++ b/sound/soc/kirkwood/kirkwood-t5325.c
@@ -16,7 +16,7 @@
#include <linux/slab.h>
#include <sound/soc.h>
#include <mach/kirkwood.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-kirkwood.h>
#include <asm/mach-types.h>
#include "../codecs/alc5623.h"
--
1.7.10
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 15/16] ARM: samsung: move platform_data definitions
2012-09-11 13:02 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
2012-09-11 13:02 ` [PATCH 14/16] ARM: orion: " Arnd Bergmann
@ 2012-09-11 13:02 ` Arnd Bergmann
2012-09-11 13:07 ` Felipe Balbi
` (3 more replies)
2012-09-11 13:02 ` [PATCH 16/16] ARM: spear: " Arnd Bergmann
2012-09-11 14:06 ` [PATCH 13/16] ARM: omap: " Shilimkar, Santosh
3 siblings, 4 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 13:02 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, Kukjin Kim,
Kyungmin Park, Ben Dooks, Mark Brown, Jeff Garzik, Guenter Roeck,
Wolfram Sang (embedded platforms),
Dmitry Torokhov, Bryan Wu, Richard Purdie, Sylwester Nawrocki,
Mauro Carvalho Chehab, Chris Ball, David Woodhouse, Grant Likely,
Felipe Balbi, Greg Kroah-Hartman, Alan Stern, Sangbeom Kim,
Liam Girdwood, linux-samsung-soc
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%)
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
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 16/16] ARM: spear: move platform_data definitions
2012-09-11 13:02 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
2012-09-11 13:02 ` [PATCH 14/16] ARM: orion: " Arnd Bergmann
2012-09-11 13:02 ` [PATCH 15/16] ARM: samsung: " Arnd Bergmann
@ 2012-09-11 13:02 ` Arnd Bergmann
2012-09-12 3:17 ` viresh kumar
2012-09-11 14:06 ` [PATCH 13/16] ARM: omap: " Shilimkar, Santosh
3 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 13:02 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Russell King, Arnd Bergmann, Viresh Kumar,
Shiraz Hashim, spear-devel, Dmitry Torokhov
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>
---
drivers/input/keyboard/spear-keyboard.c | 2 +-
.../plat/keyboard.h => include/linux/platform_data/keyboard-spear.h | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename arch/arm/plat-spear/include/plat/keyboard.h => include/linux/platform_data/keyboard-spear.h (100%)
diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c
index 72ef01b..c7ca97f 100644
--- a/drivers/input/keyboard/spear-keyboard.c
+++ b/drivers/input/keyboard/spear-keyboard.c
@@ -24,7 +24,7 @@
#include <linux/pm_wakeup.h>
#include <linux/slab.h>
#include <linux/types.h>
-#include <plat/keyboard.h>
+#include <linux/platform_data/keyboard-spear.h>
/* Keyboard Registers */
#define MODE_CTL_REG 0x00
diff --git a/arch/arm/plat-spear/include/plat/keyboard.h b/include/linux/platform_data/keyboard-spear.h
similarity index 100%
rename from arch/arm/plat-spear/include/plat/keyboard.h
rename to include/linux/platform_data/keyboard-spear.h
--
1.7.10
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [PATCH 02/16] ARM: davinci: move platform_data definitions
2012-09-11 12:59 ` [PATCH 02/16] ARM: davinci: " Arnd Bergmann
@ 2012-09-11 13:05 ` Felipe Balbi
2012-09-12 10:42 ` Hebbar, Gururaja
1 sibling, 0 replies; 69+ messages in thread
From: Felipe Balbi @ 2012-09-11 13:05 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Sekhar Nori,
Kevin Hilman, Ben Dooks, Wolfram Sang, Dmitry Torokhov,
Mauro Carvalho Chehab, Chris Ball, David Woodhouse, Grant Likely,
Alan Stern, Greg Kroah-Hartman, Felipe Balbi, Liam Girdwood,
Mark Brown, davinci-linux-open-source
[-- Attachment #1: Type: text/plain, Size: 24362 bytes --]
On Tue, Sep 11, 2012 at 02:59:36PM +0200, 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 davinci include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@ti.com>
> Cc: "Ben Dooks" <ben-linux@fluff.org>
> Cc: "Wolfram Sang" <w.sang@pengutronix.de>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.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: Alan Stern <stern@rowland.harvard.edu>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Felipe Balbi <balbi@ti.com>
> Cc: Liam Girdwood <lrg@ti.com>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: davinci-linux-open-source@linux.davincidsp.com
for musb:
Acked-by: Felipe Balbi <balbi@ti.com>
> ---
> arch/arm/mach-davinci/aemif.c | 2 +-
> arch/arm/mach-davinci/board-da830-evm.c | 8 ++++----
> arch/arm/mach-davinci/board-da850-evm.c | 6 +++---
> arch/arm/mach-davinci/board-dm355-evm.c | 8 ++++----
> arch/arm/mach-davinci/board-dm355-leopard.c | 8 ++++----
> arch/arm/mach-davinci/board-dm365-evm.c | 8 ++++----
> arch/arm/mach-davinci/board-dm644x-evm.c | 10 +++++-----
> arch/arm/mach-davinci/board-dm646x-evm.c | 6 +++---
> arch/arm/mach-davinci/board-mityomapl138.c | 4 ++--
> arch/arm/mach-davinci/board-neuros-osd2.c | 8 ++++----
> arch/arm/mach-davinci/board-sffsdr.c | 4 ++--
> arch/arm/mach-davinci/davinci.h | 4 ++--
> arch/arm/mach-davinci/devices.c | 4 ++--
> arch/arm/mach-davinci/dm355.c | 4 ++--
> arch/arm/mach-davinci/dm365.c | 6 +++---
> arch/arm/mach-davinci/dm644x.c | 2 +-
> arch/arm/mach-davinci/dm646x.c | 2 +-
> arch/arm/mach-davinci/include/mach/da8xx.h | 10 +++++-----
> arch/arm/mach-davinci/include/mach/tnetv107x.h | 4 ++--
> arch/arm/mach-davinci/usb.c | 2 +-
> drivers/i2c/busses/i2c-davinci.c | 2 +-
> drivers/input/keyboard/davinci_keyscan.c | 2 +-
> drivers/media/video/davinci/vpbe_venc.c | 2 +-
> drivers/mmc/host/davinci_mmc.c | 2 +-
> drivers/mtd/nand/davinci_nand.c | 4 ++--
> drivers/spi/spi-davinci.c | 2 +-
> drivers/usb/host/ohci-da8xx.c | 2 +-
> drivers/usb/musb/da8xx.c | 2 +-
> .../asp.h => include/linux/platform_data/asoc-davinci-evm.h | 0
> .../mach/i2c.h => include/linux/platform_data/i2c-davinci.h | 0
> .../linux/platform_data/keyscan-davinci.h | 0
> .../mach/mmc.h => include/linux/platform_data/mmc-davinci.h | 0
> .../linux/platform_data/mtd-davinci-aemif.h | 0
> .../mach/nand.h => include/linux/platform_data/mtd-davinci.h | 0
> .../mach/spi.h => include/linux/platform_data/spi-davinci.h | 0
> .../mach/usb.h => include/linux/platform_data/usb-davinci.h | 0
> sound/soc/davinci/davinci-evm.c | 2 +-
> sound/soc/davinci/davinci-i2s.c | 2 +-
> sound/soc/davinci/davinci-mcasp.h | 2 +-
> sound/soc/davinci/davinci-pcm.h | 2 +-
> 40 files changed, 68 insertions(+), 68 deletions(-)
> rename arch/arm/mach-davinci/include/mach/asp.h => include/linux/platform_data/asoc-davinci-evm.h (100%)
> rename arch/arm/mach-davinci/include/mach/i2c.h => include/linux/platform_data/i2c-davinci.h (100%)
> rename arch/arm/mach-davinci/include/mach/keyscan.h => include/linux/platform_data/keyscan-davinci.h (100%)
> rename arch/arm/mach-davinci/include/mach/mmc.h => include/linux/platform_data/mmc-davinci.h (100%)
> rename arch/arm/mach-davinci/include/mach/aemif.h => include/linux/platform_data/mtd-davinci-aemif.h (100%)
> rename arch/arm/mach-davinci/include/mach/nand.h => include/linux/platform_data/mtd-davinci.h (100%)
> rename arch/arm/mach-davinci/include/mach/spi.h => include/linux/platform_data/spi-davinci.h (100%)
> rename arch/arm/mach-davinci/include/mach/usb.h => include/linux/platform_data/usb-davinci.h (100%)
>
> diff --git a/arch/arm/mach-davinci/aemif.c b/arch/arm/mach-davinci/aemif.c
> index 1ce70a9..f091a90 100644
> --- a/arch/arm/mach-davinci/aemif.c
> +++ b/arch/arm/mach-davinci/aemif.c
> @@ -15,7 +15,7 @@
> #include <linux/module.h>
> #include <linux/time.h>
>
> -#include <mach/aemif.h>
> +#include <linux/platform_data/mtd-davinci-aemif.h>
>
> /* Timing value configuration */
>
> diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
> index 0031864..95b5e10 100644
> --- a/arch/arm/mach-davinci/board-da830-evm.c
> +++ b/arch/arm/mach-davinci/board-da830-evm.c
> @@ -28,11 +28,11 @@
>
> #include <mach/cp_intc.h>
> #include <mach/mux.h>
> -#include <mach/nand.h>
> +#include <linux/platform_data/mtd-davinci.h>
> #include <mach/da8xx.h>
> -#include <mach/usb.h>
> -#include <mach/aemif.h>
> -#include <mach/spi.h>
> +#include <linux/platform_data/usb-davinci.h>
> +#include <linux/platform_data/mtd-davinci-aemif.h>
> +#include <linux/platform_data/spi-davinci.h>
>
> #define DA830_EVM_PHY_ID ""
> /*
> diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
> index 0149fb4..1295e61 100644
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@ -40,10 +40,10 @@
>
> #include <mach/cp_intc.h>
> #include <mach/da8xx.h>
> -#include <mach/nand.h>
> +#include <linux/platform_data/mtd-davinci.h>
> #include <mach/mux.h>
> -#include <mach/aemif.h>
> -#include <mach/spi.h>
> +#include <linux/platform_data/mtd-davinci-aemif.h>
> +#include <linux/platform_data/spi-davinci.h>
>
> #define DA850_EVM_PHY_ID "davinci_mdio-0:00"
> #define DA850_LCD_PWR_PIN GPIO_TO_PIN(2, 8)
> diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
> index 1c7b1f4..88ebea8 100644
> --- a/arch/arm/mach-davinci/board-dm355-evm.c
> +++ b/arch/arm/mach-davinci/board-dm355-evm.c
> @@ -26,11 +26,11 @@
> #include <asm/mach-types.h>
> #include <asm/mach/arch.h>
>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
> #include <mach/serial.h>
> -#include <mach/nand.h>
> -#include <mach/mmc.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/mtd-davinci.h>
> +#include <linux/platform_data/mmc-davinci.h>
> +#include <linux/platform_data/usb-davinci.h>
>
> #include "davinci.h"
>
> diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
> index 8e77032..2f88103 100644
> --- a/arch/arm/mach-davinci/board-dm355-leopard.c
> +++ b/arch/arm/mach-davinci/board-dm355-leopard.c
> @@ -23,11 +23,11 @@
> #include <asm/mach-types.h>
> #include <asm/mach/arch.h>
>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
> #include <mach/serial.h>
> -#include <mach/nand.h>
> -#include <mach/mmc.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/mtd-davinci.h>
> +#include <linux/platform_data/mmc-davinci.h>
> +#include <linux/platform_data/usb-davinci.h>
>
> #include "davinci.h"
>
> diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
> index 688a9c5..1b4a8ad 100644
> --- a/arch/arm/mach-davinci/board-dm365-evm.c
> +++ b/arch/arm/mach-davinci/board-dm365-evm.c
> @@ -33,11 +33,11 @@
>
> #include <mach/mux.h>
> #include <mach/common.h>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
> #include <mach/serial.h>
> -#include <mach/mmc.h>
> -#include <mach/nand.h>
> -#include <mach/keyscan.h>
> +#include <linux/platform_data/mmc-davinci.h>
> +#include <linux/platform_data/mtd-davinci.h>
> +#include <linux/platform_data/keyscan-davinci.h>
>
> #include <media/tvp514x.h>
>
> diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
> index d34ed55..ca72fc4 100644
> --- a/arch/arm/mach-davinci/board-dm644x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm644x-evm.c
> @@ -31,13 +31,13 @@
> #include <asm/mach/arch.h>
>
> #include <mach/common.h>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
> #include <mach/serial.h>
> #include <mach/mux.h>
> -#include <mach/nand.h>
> -#include <mach/mmc.h>
> -#include <mach/usb.h>
> -#include <mach/aemif.h>
> +#include <linux/platform_data/mtd-davinci.h>
> +#include <linux/platform_data/mmc-davinci.h>
> +#include <linux/platform_data/usb-davinci.h>
> +#include <linux/platform_data/mtd-davinci-aemif.h>
>
> #include "davinci.h"
>
> diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
> index 958679a..9944367 100644
> --- a/arch/arm/mach-davinci/board-dm646x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm646x-evm.c
> @@ -38,11 +38,11 @@
>
> #include <mach/common.h>
> #include <mach/serial.h>
> -#include <mach/i2c.h>
> -#include <mach/nand.h>
> +#include <linux/platform_data/i2c-davinci.h>
> +#include <linux/platform_data/mtd-davinci.h>
> #include <mach/clock.h>
> #include <mach/cdce949.h>
> -#include <mach/aemif.h>
> +#include <linux/platform_data/mtd-davinci-aemif.h>
>
> #include "davinci.h"
> #include "clock.h"
> diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
> index beecde3..43e4a0d 100644
> --- a/arch/arm/mach-davinci/board-mityomapl138.c
> +++ b/arch/arm/mach-davinci/board-mityomapl138.c
> @@ -26,9 +26,9 @@
> #include <mach/common.h>
> #include <mach/cp_intc.h>
> #include <mach/da8xx.h>
> -#include <mach/nand.h>
> +#include <linux/platform_data/mtd-davinci.h>
> #include <mach/mux.h>
> -#include <mach/spi.h>
> +#include <linux/platform_data/spi-davinci.h>
>
> #define MITYOMAPL138_PHY_ID ""
>
> diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
> index f6b9fc7..144bf31 100644
> --- a/arch/arm/mach-davinci/board-neuros-osd2.c
> +++ b/arch/arm/mach-davinci/board-neuros-osd2.c
> @@ -31,12 +31,12 @@
> #include <asm/mach/arch.h>
>
> #include <mach/common.h>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
> #include <mach/serial.h>
> #include <mach/mux.h>
> -#include <mach/nand.h>
> -#include <mach/mmc.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/mtd-davinci.h>
> +#include <linux/platform_data/mmc-davinci.h>
> +#include <linux/platform_data/usb-davinci.h>
>
> #include "davinci.h"
>
> diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
> index 9078acf..6957787 100644
> --- a/arch/arm/mach-davinci/board-sffsdr.c
> +++ b/arch/arm/mach-davinci/board-sffsdr.c
> @@ -36,10 +36,10 @@
> #include <asm/mach/flash.h>
>
> #include <mach/common.h>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
> #include <mach/serial.h>
> #include <mach/mux.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/usb-davinci.h>
>
> #include "davinci.h"
>
> diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h
> index 8db0fc6..43ddf87 100644
> --- a/arch/arm/mach-davinci/davinci.h
> +++ b/arch/arm/mach-davinci/davinci.h
> @@ -23,8 +23,8 @@
> #include <linux/platform_device.h>
> #include <linux/spi/spi.h>
>
> -#include <mach/asp.h>
> -#include <mach/keyscan.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
> +#include <linux/platform_data/keyscan-davinci.h>
> #include <mach/hardware.h>
>
> #include <media/davinci/vpfe_capture.h>
> diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
> index d2f96662..3a42b6f 100644
> --- a/arch/arm/mach-davinci/devices.c
> +++ b/arch/arm/mach-davinci/devices.c
> @@ -15,12 +15,12 @@
> #include <linux/io.h>
>
> #include <mach/hardware.h>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
> #include <mach/irqs.h>
> #include <mach/cputype.h>
> #include <mach/mux.h>
> #include <mach/edma.h>
> -#include <mach/mmc.h>
> +#include <linux/platform_data/mmc-davinci.h>
> #include <mach/time.h>
>
> #include "davinci.h"
> diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
> index 678cd99..612e403 100644
> --- a/arch/arm/mach-davinci/dm355.c
> +++ b/arch/arm/mach-davinci/dm355.c
> @@ -26,8 +26,8 @@
> #include <mach/time.h>
> #include <mach/serial.h>
> #include <mach/common.h>
> -#include <mach/asp.h>
> -#include <mach/spi.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
> +#include <linux/platform_data/spi-davinci.h>
> #include <mach/gpio-davinci.h>
>
> #include "davinci.h"
> diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
> index a50d49de..ee4b0b0 100644
> --- a/arch/arm/mach-davinci/dm365.c
> +++ b/arch/arm/mach-davinci/dm365.c
> @@ -29,9 +29,9 @@
> #include <mach/time.h>
> #include <mach/serial.h>
> #include <mach/common.h>
> -#include <mach/asp.h>
> -#include <mach/keyscan.h>
> -#include <mach/spi.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
> +#include <linux/platform_data/keyscan-davinci.h>
> +#include <linux/platform_data/spi-davinci.h>
> #include <mach/gpio-davinci.h>
>
> #include "davinci.h"
> diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
> index c8b8666..9018a44 100644
> --- a/arch/arm/mach-davinci/dm644x.c
> +++ b/arch/arm/mach-davinci/dm644x.c
> @@ -23,7 +23,7 @@
> #include <mach/time.h>
> #include <mach/serial.h>
> #include <mach/common.h>
> -#include <mach/asp.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
> #include <mach/gpio-davinci.h>
>
> #include "davinci.h"
> diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
> index 9eb87c1..56f8e6e 100644
> --- a/arch/arm/mach-davinci/dm646x.c
> +++ b/arch/arm/mach-davinci/dm646x.c
> @@ -24,7 +24,7 @@
> #include <mach/time.h>
> #include <mach/serial.h>
> #include <mach/common.h>
> -#include <mach/asp.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
> #include <mach/gpio-davinci.h>
>
> #include "davinci.h"
> diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
> index a2f1f27..a273d06 100644
> --- a/arch/arm/mach-davinci/include/mach/da8xx.h
> +++ b/arch/arm/mach-davinci/include/mach/da8xx.h
> @@ -19,12 +19,12 @@
>
> #include <mach/serial.h>
> #include <mach/edma.h>
> -#include <mach/i2c.h>
> -#include <mach/asp.h>
> -#include <mach/mmc.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/i2c-davinci.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
> +#include <linux/platform_data/mmc-davinci.h>
> +#include <linux/platform_data/usb-davinci.h>
> #include <mach/pm.h>
> -#include <mach/spi.h>
> +#include <linux/platform_data/spi-davinci.h>
>
> extern void __iomem *da8xx_syscfg0_base;
> extern void __iomem *da8xx_syscfg1_base;
> diff --git a/arch/arm/mach-davinci/include/mach/tnetv107x.h b/arch/arm/mach-davinci/include/mach/tnetv107x.h
> index 83e5926..1656a02 100644
> --- a/arch/arm/mach-davinci/include/mach/tnetv107x.h
> +++ b/arch/arm/mach-davinci/include/mach/tnetv107x.h
> @@ -36,8 +36,8 @@
> #include <linux/input/matrix_keypad.h>
> #include <linux/mfd/ti_ssp.h>
>
> -#include <mach/mmc.h>
> -#include <mach/nand.h>
> +#include <linux/platform_data/mmc-davinci.h>
> +#include <linux/platform_data/mtd-davinci.h>
> #include <mach/serial.h>
>
> struct tnetv107x_device_info {
> diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
> index 23d2b6d..f77b953 100644
> --- a/arch/arm/mach-davinci/usb.c
> +++ b/arch/arm/mach-davinci/usb.c
> @@ -10,7 +10,7 @@
> #include <mach/common.h>
> #include <mach/irqs.h>
> #include <mach/cputype.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/usb-davinci.h>
>
> #define DAVINCI_USB_OTG_BASE 0x01c64000
>
> diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
> index 79b4bcb..79a2542 100644
> --- a/drivers/i2c/busses/i2c-davinci.c
> +++ b/drivers/i2c/busses/i2c-davinci.c
> @@ -40,7 +40,7 @@
> #include <linux/gpio.h>
>
> #include <mach/hardware.h>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
>
> /* ----- global defines ----------------------------------------------- */
>
> diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c
> index 9d82b3a..d5bacbb 100644
> --- a/drivers/input/keyboard/davinci_keyscan.c
> +++ b/drivers/input/keyboard/davinci_keyscan.c
> @@ -36,7 +36,7 @@
>
> #include <mach/hardware.h>
> #include <mach/irqs.h>
> -#include <mach/keyscan.h>
> +#include <linux/platform_data/keyscan-davinci.h>
>
> /* Key scan registers */
> #define DAVINCI_KEYSCAN_KEYCTRL 0x0000
> diff --git a/drivers/media/video/davinci/vpbe_venc.c b/drivers/media/video/davinci/vpbe_venc.c
> index b21ecc8..0302669 100644
> --- a/drivers/media/video/davinci/vpbe_venc.c
> +++ b/drivers/media/video/davinci/vpbe_venc.c
> @@ -27,7 +27,7 @@
>
> #include <mach/hardware.h>
> #include <mach/mux.h>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
>
> #include <linux/io.h>
>
> diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
> index 7cf6c62..3dfd347 100644
> --- a/drivers/mmc/host/davinci_mmc.c
> +++ b/drivers/mmc/host/davinci_mmc.c
> @@ -33,7 +33,7 @@
> #include <linux/dma-mapping.h>
> #include <linux/mmc/mmc.h>
>
> -#include <mach/mmc.h>
> +#include <linux/platform_data/mmc-davinci.h>
> #include <mach/edma.h>
>
> /*
> diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
> index d94b03c..f1deb1e 100644
> --- a/drivers/mtd/nand/davinci_nand.c
> +++ b/drivers/mtd/nand/davinci_nand.c
> @@ -34,8 +34,8 @@
> #include <linux/mtd/partitions.h>
> #include <linux/slab.h>
>
> -#include <mach/nand.h>
> -#include <mach/aemif.h>
> +#include <linux/platform_data/mtd-davinci.h>
> +#include <linux/platform_data/mtd-davinci-aemif.h>
>
> /*
> * This is a device driver for the NAND flash controller found on the
> diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
> index 9b2901f..3afe2f4 100644
> --- a/drivers/spi/spi-davinci.c
> +++ b/drivers/spi/spi-davinci.c
> @@ -30,7 +30,7 @@
> #include <linux/spi/spi_bitbang.h>
> #include <linux/slab.h>
>
> -#include <mach/spi.h>
> +#include <linux/platform_data/spi-davinci.h>
> #include <mach/edma.h>
>
> #define SPI_NO_RESOURCE ((resource_size_t)-1)
> diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
> index 269b1e0..0b815a8 100644
> --- a/drivers/usb/host/ohci-da8xx.c
> +++ b/drivers/usb/host/ohci-da8xx.c
> @@ -17,7 +17,7 @@
> #include <linux/clk.h>
>
> #include <mach/da8xx.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/usb-davinci.h>
>
> #ifndef CONFIG_ARCH_DAVINCI_DA8XX
> #error "This file is DA8xx bus glue. Define CONFIG_ARCH_DAVINCI_DA8XX."
> diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
> index 0f9fcec..15a2627 100644
> --- a/drivers/usb/musb/da8xx.c
> +++ b/drivers/usb/musb/da8xx.c
> @@ -35,7 +35,7 @@
> #include <linux/dma-mapping.h>
>
> #include <mach/da8xx.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/usb-davinci.h>
>
> #include "musb_core.h"
>
> diff --git a/arch/arm/mach-davinci/include/mach/asp.h b/include/linux/platform_data/asoc-davinci-evm.h
> similarity index 100%
> rename from arch/arm/mach-davinci/include/mach/asp.h
> rename to include/linux/platform_data/asoc-davinci-evm.h
> diff --git a/arch/arm/mach-davinci/include/mach/i2c.h b/include/linux/platform_data/i2c-davinci.h
> similarity index 100%
> rename from arch/arm/mach-davinci/include/mach/i2c.h
> rename to include/linux/platform_data/i2c-davinci.h
> diff --git a/arch/arm/mach-davinci/include/mach/keyscan.h b/include/linux/platform_data/keyscan-davinci.h
> similarity index 100%
> rename from arch/arm/mach-davinci/include/mach/keyscan.h
> rename to include/linux/platform_data/keyscan-davinci.h
> diff --git a/arch/arm/mach-davinci/include/mach/mmc.h b/include/linux/platform_data/mmc-davinci.h
> similarity index 100%
> rename from arch/arm/mach-davinci/include/mach/mmc.h
> rename to include/linux/platform_data/mmc-davinci.h
> diff --git a/arch/arm/mach-davinci/include/mach/aemif.h b/include/linux/platform_data/mtd-davinci-aemif.h
> similarity index 100%
> rename from arch/arm/mach-davinci/include/mach/aemif.h
> rename to include/linux/platform_data/mtd-davinci-aemif.h
> diff --git a/arch/arm/mach-davinci/include/mach/nand.h b/include/linux/platform_data/mtd-davinci.h
> similarity index 100%
> rename from arch/arm/mach-davinci/include/mach/nand.h
> rename to include/linux/platform_data/mtd-davinci.h
> diff --git a/arch/arm/mach-davinci/include/mach/spi.h b/include/linux/platform_data/spi-davinci.h
> similarity index 100%
> rename from arch/arm/mach-davinci/include/mach/spi.h
> rename to include/linux/platform_data/spi-davinci.h
> diff --git a/arch/arm/mach-davinci/include/mach/usb.h b/include/linux/platform_data/usb-davinci.h
> similarity index 100%
> rename from arch/arm/mach-davinci/include/mach/usb.h
> rename to include/linux/platform_data/usb-davinci.h
> diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
> index 10a2d8c..5717bed 100644
> --- a/sound/soc/davinci/davinci-evm.c
> +++ b/sound/soc/davinci/davinci-evm.c
> @@ -22,7 +22,7 @@
> #include <asm/dma.h>
> #include <asm/mach-types.h>
>
> -#include <mach/asp.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
> #include <mach/edma.h>
> #include <mach/mux.h>
>
> diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
> index 0a74b95..6e58828 100644
> --- a/sound/soc/davinci/davinci-i2s.c
> +++ b/sound/soc/davinci/davinci-i2s.c
> @@ -23,7 +23,7 @@
> #include <sound/initval.h>
> #include <sound/soc.h>
>
> -#include <mach/asp.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
>
> #include "davinci-pcm.h"
> #include "davinci-i2s.h"
> diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
> index 4681acc..302aab2 100644
> --- a/sound/soc/davinci/davinci-mcasp.h
> +++ b/sound/soc/davinci/davinci-mcasp.h
> @@ -19,7 +19,7 @@
> #define DAVINCI_MCASP_H
>
> #include <linux/io.h>
> -#include <mach/asp.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
> #include "davinci-pcm.h"
>
> #define DAVINCI_MCASP_RATES SNDRV_PCM_RATE_8000_96000
> diff --git a/sound/soc/davinci/davinci-pcm.h b/sound/soc/davinci/davinci-pcm.h
> index c0d6c9b..36d31cd 100644
> --- a/sound/soc/davinci/davinci-pcm.h
> +++ b/sound/soc/davinci/davinci-pcm.h
> @@ -13,7 +13,7 @@
> #define _DAVINCI_PCM_H
>
> #include <mach/edma.h>
> -#include <mach/asp.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
>
>
> struct davinci_pcm_dma_params {
> --
> 1.7.10
>
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 12/16] ARM: nomadik: move platform_data definitions
2012-09-11 12:59 ` [PATCH 12/16] ARM: nomadik: " Arnd Bergmann
@ 2012-09-11 13:07 ` Felipe Balbi
2012-09-11 13:31 ` Linus Walleij
1 sibling, 0 replies; 69+ messages in thread
From: Felipe Balbi @ 2012-09-11 13:07 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Alessandro Rubini,
Linus Walleij, STEricsson, Srinidhi Kasagar, Herbert Xu,
David S. Miller, Dmitry Torokhov, David Woodhouse, Felipe Balbi,
Greg Kroah-Hartman, Andreas Westin
[-- Attachment #1: Type: text/plain, Size: 9617 bytes --]
On Tue, Sep 11, 2012 at 02:59:46PM +0200, 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 nomadik include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Alessandro Rubini <rubini@unipv.it>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: STEricsson <STEricsson_nomadik_linux@list.st.com>
> Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Felipe Balbi <balbi@ti.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Andreas Westin <andreas.westin@stericsson.com>
for musb:
Acked-by: Felipe Balbi <balbi@ti.com>
> ---
> arch/arm/mach-nomadik/board-nhk8815.c | 2 +-
> arch/arm/mach-u300/core.c | 2 +-
> arch/arm/mach-ux500/board-mop500.c | 2 +-
> arch/arm/mach-ux500/cpu-db8500.c | 2 +-
> arch/arm/mach-ux500/devices-common.h | 2 +-
> arch/arm/mach-ux500/usb.c | 2 +-
> drivers/crypto/ux500/cryp/cryp_core.c | 2 +-
> drivers/crypto/ux500/hash/hash_core.c | 2 +-
> drivers/input/keyboard/nomadik-ske-keypad.c | 2 +-
> drivers/mtd/nand/nomadik_nand.c | 2 +-
> drivers/pinctrl/pinctrl-coh901.c | 2 +-
> drivers/usb/musb/ux500_dma.c | 2 +-
> .../include/mach => include/linux/platform_data}/crypto-ux500.h | 0
> .../plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h | 0
> .../mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h | 0
> .../mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h | 0
> .../mach/usb.h => include/linux/platform_data/usb-musb-ux500.h | 0
> 17 files changed, 12 insertions(+), 12 deletions(-)
> rename {arch/arm/mach-ux500/include/mach => include/linux/platform_data}/crypto-ux500.h (100%)
> rename arch/arm/plat-nomadik/include/plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h (100%)
> rename arch/arm/mach-nomadik/include/mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h (100%)
> rename arch/arm/mach-u300/include/mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h (100%)
> rename arch/arm/mach-ux500/include/mach/usb.h => include/linux/platform_data/usb-musb-ux500.h (100%)
>
> diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c
> index f4535a7..381c080 100644
> --- a/arch/arm/mach-nomadik/board-nhk8815.c
> +++ b/arch/arm/mach-nomadik/board-nhk8815.c
> @@ -34,7 +34,7 @@
> #include <plat/gpio-nomadik.h>
> #include <plat/mtu.h>
>
> -#include <mach/nand.h>
> +#include <linux/platform_data/mtd-nomadik-nand.h>
> #include <mach/fsmc.h>
>
> #include "cpu-8815.h"
> diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
> index 03acf18..62adfe7 100644
> --- a/arch/arm/mach-u300/core.c
> +++ b/arch/arm/mach-u300/core.c
> @@ -43,7 +43,7 @@
> #include <mach/hardware.h>
> #include <mach/syscon.h>
> #include <mach/dma_channels.h>
> -#include <mach/gpio-u300.h>
> +#include <linux/platform_data/pinctrl-coh901.h>
>
> #include "spi.h"
> #include "i2c.h"
> diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
> index 8674a89..38854d4 100644
> --- a/arch/arm/mach-ux500/board-mop500.c
> +++ b/arch/arm/mach-ux500/board-mop500.c
> @@ -48,7 +48,7 @@
> #include <mach/setup.h>
> #include <mach/devices.h>
> #include <mach/irqs.h>
> -#include <mach/crypto-ux500.h>
> +#include <linux/platform_data/crypto-ux500.h>
>
> #include "ste-dma40-db8500.h"
> #include "devices-db8500.h"
> diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
> index db3c52d..1bef4c3 100644
> --- a/arch/arm/mach-ux500/cpu-db8500.c
> +++ b/arch/arm/mach-ux500/cpu-db8500.c
> @@ -24,7 +24,7 @@
> #include <mach/hardware.h>
> #include <mach/setup.h>
> #include <mach/devices.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/usb-musb-ux500.h>
> #include <mach/db8500-regs.h>
>
> #include "devices-db8500.h"
> diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h
> index ecdd838..7fbf0ba 100644
> --- a/arch/arm/mach-ux500/devices-common.h
> +++ b/arch/arm/mach-ux500/devices-common.h
> @@ -13,7 +13,7 @@
> #include <linux/sys_soc.h>
> #include <linux/amba/bus.h>
> #include <linux/platform_data/i2c-nomadik.h>
> -#include <mach/crypto-ux500.h>
> +#include <linux/platform_data/crypto-ux500.h>
>
> struct spi_master_cntlr;
>
> diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c
> index a74af38..145482e 100644
> --- a/arch/arm/mach-ux500/usb.c
> +++ b/arch/arm/mach-ux500/usb.c
> @@ -10,7 +10,7 @@
>
> #include <plat/ste_dma40.h>
> #include <mach/hardware.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/usb-musb-ux500.h>
>
> #define MUSB_DMA40_RX_CH { \
> .mode = STEDMA40_MODE_LOGICAL, \
> diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c
> index 1c307e1..ef17e38 100644
> --- a/drivers/crypto/ux500/cryp/cryp_core.c
> +++ b/drivers/crypto/ux500/cryp/cryp_core.c
> @@ -32,7 +32,7 @@
>
> #include <plat/ste_dma40.h>
>
> -#include <mach/crypto-ux500.h>
> +#include <linux/platform_data/crypto-ux500.h>
> #include <mach/hardware.h>
>
> #include "cryp_p.h"
> diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
> index 08d5032..0876507 100644
> --- a/drivers/crypto/ux500/hash/hash_core.c
> +++ b/drivers/crypto/ux500/hash/hash_core.c
> @@ -31,7 +31,7 @@
> #include <crypto/scatterwalk.h>
> #include <crypto/algapi.h>
>
> -#include <mach/crypto-ux500.h>
> +#include <linux/platform_data/crypto-ux500.h>
> #include <mach/hardware.h>
>
> #include "hash_alg.h"
> diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c
> index a880e74..49f5fa6 100644
> --- a/drivers/input/keyboard/nomadik-ske-keypad.c
> +++ b/drivers/input/keyboard/nomadik-ske-keypad.c
> @@ -20,7 +20,7 @@
> #include <linux/clk.h>
> #include <linux/module.h>
>
> -#include <plat/ske.h>
> +#include <linux/platform_data/keypad-nomadik-ske.h>
>
> /* SKE_CR bits */
> #define SKE_KPMLT (0x1 << 6)
> diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c
> index a86aa81..9ee0c4e 100644
> --- a/drivers/mtd/nand/nomadik_nand.c
> +++ b/drivers/mtd/nand/nomadik_nand.c
> @@ -31,7 +31,7 @@
> #include <linux/mtd/partitions.h>
> #include <linux/io.h>
> #include <linux/slab.h>
> -#include <mach/nand.h>
> +#include <linux/platform_data/mtd-nomadik-nand.h>
> #include <mach/fsmc.h>
>
> #include <mtd/mtd-abi.h>
> diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c
> index cc0f00d..b7f41e9 100644
> --- a/drivers/pinctrl/pinctrl-coh901.c
> +++ b/drivers/pinctrl/pinctrl-coh901.c
> @@ -24,7 +24,7 @@
> #include <linux/slab.h>
> #include <linux/pinctrl/consumer.h>
> #include <linux/pinctrl/pinconf-generic.h>
> -#include <mach/gpio-u300.h>
> +#include <linux/platform_data/pinctrl-coh901.h>
> #include "pinctrl-coh901.h"
>
> /*
> diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
> index d05c7fb..f82246d 100644
> --- a/drivers/usb/musb/ux500_dma.c
> +++ b/drivers/usb/musb/ux500_dma.c
> @@ -30,7 +30,7 @@
> #include <linux/dma-mapping.h>
> #include <linux/dmaengine.h>
> #include <linux/pfn.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/usb-musb-ux500.h>
> #include "musb_core.h"
>
> struct ux500_dma_channel {
> diff --git a/arch/arm/mach-ux500/include/mach/crypto-ux500.h b/include/linux/platform_data/crypto-ux500.h
> similarity index 100%
> rename from arch/arm/mach-ux500/include/mach/crypto-ux500.h
> rename to include/linux/platform_data/crypto-ux500.h
> diff --git a/arch/arm/plat-nomadik/include/plat/ske.h b/include/linux/platform_data/keypad-nomadik-ske.h
> similarity index 100%
> rename from arch/arm/plat-nomadik/include/plat/ske.h
> rename to include/linux/platform_data/keypad-nomadik-ske.h
> diff --git a/arch/arm/mach-nomadik/include/mach/nand.h b/include/linux/platform_data/mtd-nomadik-nand.h
> similarity index 100%
> rename from arch/arm/mach-nomadik/include/mach/nand.h
> rename to include/linux/platform_data/mtd-nomadik-nand.h
> diff --git a/arch/arm/mach-u300/include/mach/gpio-u300.h b/include/linux/platform_data/pinctrl-coh901.h
> similarity index 100%
> rename from arch/arm/mach-u300/include/mach/gpio-u300.h
> rename to include/linux/platform_data/pinctrl-coh901.h
> diff --git a/arch/arm/mach-ux500/include/mach/usb.h b/include/linux/platform_data/usb-musb-ux500.h
> similarity index 100%
> rename from arch/arm/mach-ux500/include/mach/usb.h
> rename to include/linux/platform_data/usb-musb-ux500.h
> --
> 1.7.10
>
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 15/16] ARM: samsung: move platform_data definitions
2012-09-11 13:02 ` [PATCH 15/16] ARM: samsung: " Arnd Bergmann
@ 2012-09-11 13:07 ` Felipe Balbi
2012-09-11 17:12 ` Jeff Garzik
` (2 subsequent siblings)
3 siblings, 0 replies; 69+ messages in thread
From: Felipe Balbi @ 2012-09-11 13:07 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Kukjin Kim,
Kyungmin Park, Ben Dooks, Mark Brown, Jeff Garzik, Guenter Roeck,
Wolfram Sang (embedded platforms),
Dmitry Torokhov, Bryan Wu, Richard Purdie, Sylwester Nawrocki,
Mauro Carvalho Chehab, Chris Ball, David Woodhouse, Grant Likely,
Felipe Balbi, Greg Kroah-Hartman, Alan Stern, Sangbeom Kim,
Liam Girdwood, linux-samsung-soc
[-- Attachment #1: Type: text/plain, Size: 64087 bytes --]
On Tue, Sep 11, 2012 at 03:02:38PM +0200, 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
for drivers/usb/gadget/:
Acked-by: Felipe Balbi <balbi@ti.com>
> ---
> 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
>
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 14/16] ARM: orion: move platform_data definitions
2012-09-11 13:02 ` [PATCH 14/16] ARM: orion: " Arnd Bergmann
@ 2012-09-11 13:11 ` Thomas Petazzoni
0 siblings, 0 replies; 69+ messages in thread
From: Thomas Petazzoni @ 2012-09-11 13:11 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, Andrew Lunn, Mark Brown, Russell King,
Jason Cooper, Nicolas Pitre, Vinod Koul, Greg Kroah-Hartman,
Bryan Wu, linux-kernel, Jaroslav Kysela, Takashi Iwai,
Richard Purdie, Dan Williams, Alan Stern, Chris Ball,
David Woodhouse, Liam Girdwood
Hello Arnd,
Le Tue, 11 Sep 2012 15:02:37 +0200,
Arnd Bergmann <arnd@arndb.de> a écrit :
> Platform data for device drivers should be defined in
> include/linux/platform_data/*.h, not in the architecture
> and platform specific directories.
>
> This moves such data out of the orion include directories
I have already posted patches for this during the ARM summit, see:
http://lists.infradead.org/pipermail/linux-arm-kernel/2012-August/116380.html.
They have been applied by the Marvell maintainer Jason Cooper and are
scheduled for 3.7, see
http://lists.infradead.org/pipermail/linux-arm-kernel/2012-August/116432.html.
Best regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 01/16] ARM: at91: move platform_data definitions
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
` (10 preceding siblings ...)
2012-09-11 12:59 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
@ 2012-09-11 13:20 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-11 13:35 ` Nicolas Ferre
2012-09-11 18:29 ` [PATCH 12/16] ARM: nomadik: " Alessandro Rubini
2012-09-14 3:18 ` [PATCH 01/16] ARM: at91: " Vinod Koul
13 siblings, 1 reply; 69+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-09-11 13:20 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Nicolas Ferre,
Vinod Koul, Dan Williams
On 14:59 Tue 11 Sep , 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 at91 include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
> Cc: Vinod Koul <vinod.koul@intel.com>
> Cc: Dan Williams <djbw@fb.com>
> ---
> arch/arm/mach-at91/at91sam9g45_devices.c | 2 +-
> arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
> arch/arm/mach-at91/include/mach/atmel-mci.h | 2 +-
> drivers/dma/at_hdmac_regs.h | 2 +-
> include/linux/platform_data/atmel-aes.h | 2 +-
> .../mach/at_hdmac.h => include/linux/platform_data/dma-atmel.h | 0
> 6 files changed, 5 insertions(+), 5 deletions(-)
> rename arch/arm/mach-at91/include/mach/at_hdmac.h => include/linux/platform_data/dma-atmel.h (100%)
>
> diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
> index 0607399..0aa9bdb 100644
> --- a/arch/arm/mach-at91/at91sam9g45_devices.c
> +++ b/arch/arm/mach-at91/at91sam9g45_devices.c
> @@ -31,7 +31,7 @@
> #include <mach/at91sam9g45_matrix.h>
> #include <mach/at91_matrix.h>
> #include <mach/at91sam9_smc.h>
> -#include <mach/at_hdmac.h>
> +#include <linux/platform_data/dma-atmel.h>
> #include <mach/atmel-mci.h>
>
> #include <media/atmel-isi.h>
> diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
> index f09fff9..e4da717 100644
> --- a/arch/arm/mach-at91/at91sam9rl_devices.c
> +++ b/arch/arm/mach-at91/at91sam9rl_devices.c
> @@ -22,7 +22,7 @@
> #include <mach/at91sam9rl_matrix.h>
> #include <mach/at91_matrix.h>
> #include <mach/at91sam9_smc.h>
> -#include <mach/at_hdmac.h>
> +#include <linux/platform_data/dma-atmel.h>
I prefer to have all of them in atmel.h
as I started
Best Regards,
J.
>
> #include "generic.h"
>
> diff --git a/arch/arm/mach-at91/include/mach/atmel-mci.h b/arch/arm/mach-at91/include/mach/atmel-mci.h
> index 998cb0c..cd580a1 100644
> --- a/arch/arm/mach-at91/include/mach/atmel-mci.h
> +++ b/arch/arm/mach-at91/include/mach/atmel-mci.h
> @@ -1,7 +1,7 @@
> #ifndef __MACH_ATMEL_MCI_H
> #define __MACH_ATMEL_MCI_H
>
> -#include <mach/at_hdmac.h>
> +#include <linux/platform_data/dma-atmel.h>
>
> /**
> * struct mci_dma_data - DMA data for MCI interface
> diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h
> index 8a6c8e8..116e4ad 100644
> --- a/drivers/dma/at_hdmac_regs.h
> +++ b/drivers/dma/at_hdmac_regs.h
> @@ -11,7 +11,7 @@
> #ifndef AT_HDMAC_REGS_H
> #define AT_HDMAC_REGS_H
>
> -#include <mach/at_hdmac.h>
> +#include <linux/platform_data/dma-atmel.h>
>
> #define AT_DMA_MAX_NR_CHANNELS 8
>
> diff --git a/include/linux/platform_data/atmel-aes.h b/include/linux/platform_data/atmel-aes.h
> index e7a1949..ab68082 100644
> --- a/include/linux/platform_data/atmel-aes.h
> +++ b/include/linux/platform_data/atmel-aes.h
> @@ -1,7 +1,7 @@
> #ifndef __LINUX_ATMEL_AES_H
> #define __LINUX_ATMEL_AES_H
>
> -#include <mach/at_hdmac.h>
> +#include <linux/platform_data/dma-atmel.h>
>
> /**
> * struct aes_dma_data - DMA data for AES
> diff --git a/arch/arm/mach-at91/include/mach/at_hdmac.h b/include/linux/platform_data/dma-atmel.h
> similarity index 100%
> rename from arch/arm/mach-at91/include/mach/at_hdmac.h
> rename to include/linux/platform_data/dma-atmel.h
> --
> 1.7.10
>
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 12/16] ARM: nomadik: move platform_data definitions
2012-09-11 12:59 ` [PATCH 12/16] ARM: nomadik: " Arnd Bergmann
2012-09-11 13:07 ` Felipe Balbi
@ 2012-09-11 13:31 ` Linus Walleij
2012-09-11 13:46 ` Arnd Bergmann
2012-09-12 16:24 ` Arnd Bergmann
1 sibling, 2 replies; 69+ messages in thread
From: Linus Walleij @ 2012-09-11 13:31 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Alessandro Rubini,
STEricsson, Srinidhi Kasagar, Herbert Xu, David S. Miller,
Dmitry Torokhov, David Woodhouse, Felipe Balbi,
Greg Kroah-Hartman, Andreas Westin
On Tue, Sep 11, 2012 at 5:59 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> arch/arm/mach-nomadik/board-nhk8815.c | 2 +-
> arch/arm/mach-u300/core.c | 2 +-
> arch/arm/mach-ux500/board-mop500.c | 2 +-
> arch/arm/mach-ux500/cpu-db8500.c | 2 +-
> arch/arm/mach-ux500/devices-common.h | 2 +-
> arch/arm/mach-ux500/usb.c | 2 +-
> drivers/crypto/ux500/cryp/cryp_core.c | 2 +-
> drivers/crypto/ux500/hash/hash_core.c | 2 +-
> drivers/input/keyboard/nomadik-ske-keypad.c | 2 +-
> drivers/mtd/nand/nomadik_nand.c | 2 +-
> drivers/pinctrl/pinctrl-coh901.c | 2 +-
> drivers/usb/musb/ux500_dma.c | 2 +-
> .../include/mach => include/linux/platform_data}/crypto-ux500.h | 0
> .../plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h | 0
> .../mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h | 0
> .../mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h | 0
I sent a patch for moving gpio-u300.h like this in commit
651728507140246e9cf4e809f1877cb2eddbc84e
that is already in linux-next, is this the same patch or
another one?
> .../mach/usb.h => include/linux/platform_data/usb-musb-ux500.h | 0
> 17 files changed, 12 insertions(+), 12 deletions(-)
> rename {arch/arm/mach-ux500/include/mach => include/linux/platform_data}/crypto-ux500.h (100%)
> rename arch/arm/plat-nomadik/include/plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h (100%)
> rename arch/arm/mach-nomadik/include/mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h (100%)
> rename arch/arm/mach-u300/include/mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h (100%)
> rename arch/arm/mach-ux500/include/mach/usb.h => include/linux/platform_data/usb-musb-ux500.h (100%)
For the rest, Acked-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 01/16] ARM: at91: move platform_data definitions
2012-09-11 13:20 ` [PATCH 01/16] ARM: at91: " Jean-Christophe PLAGNIOL-VILLARD
@ 2012-09-11 13:35 ` Nicolas Ferre
0 siblings, 0 replies; 69+ messages in thread
From: Nicolas Ferre @ 2012-09-11 13:35 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD, Arnd Bergmann, linux-arm-kernel
Cc: linux-kernel, Russell King, Vinod Koul, Dan Williams
On 09/11/2012 03:20 PM, Jean-Christophe PLAGNIOL-VILLARD :
> On 14:59 Tue 11 Sep , 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 at91 include directories
>>
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
>> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
>> Cc: Vinod Koul <vinod.koul@intel.com>
>> Cc: Dan Williams <djbw@fb.com>
>> ---
>> arch/arm/mach-at91/at91sam9g45_devices.c | 2 +-
>> arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
>> arch/arm/mach-at91/include/mach/atmel-mci.h | 2 +-
>> drivers/dma/at_hdmac_regs.h | 2 +-
>> include/linux/platform_data/atmel-aes.h | 2 +-
>> .../mach/at_hdmac.h => include/linux/platform_data/dma-atmel.h | 0
>> 6 files changed, 5 insertions(+), 5 deletions(-)
>> rename arch/arm/mach-at91/include/mach/at_hdmac.h => include/linux/platform_data/dma-atmel.h (100%)
>>
>> diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
>> index 0607399..0aa9bdb 100644
>> --- a/arch/arm/mach-at91/at91sam9g45_devices.c
>> +++ b/arch/arm/mach-at91/at91sam9g45_devices.c
>> @@ -31,7 +31,7 @@
>> #include <mach/at91sam9g45_matrix.h>
>> #include <mach/at91_matrix.h>
>> #include <mach/at91sam9_smc.h>
>> -#include <mach/at_hdmac.h>
>> +#include <linux/platform_data/dma-atmel.h>
>> #include <mach/atmel-mci.h>
>>
>> #include <media/atmel-isi.h>
>> diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
>> index f09fff9..e4da717 100644
>> --- a/arch/arm/mach-at91/at91sam9rl_devices.c
>> +++ b/arch/arm/mach-at91/at91sam9rl_devices.c
>> @@ -22,7 +22,7 @@
>> #include <mach/at91sam9rl_matrix.h>
>> #include <mach/at91_matrix.h>
>> #include <mach/at91sam9_smc.h>
>> -#include <mach/at_hdmac.h>
>> +#include <linux/platform_data/dma-atmel.h>
> I prefer to have all of them in atmel.h
>
> as I started
Sorry J. but I do not agree:
- ok for what is currently in include/mach/board.h ==> platform_data/atmel.h
- no for individual drivers that have already a dedicated header file
So for this move of at_hdmac.h ==> dma-atmel.h
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Best regards,
>> #include "generic.h"
>>
>> diff --git a/arch/arm/mach-at91/include/mach/atmel-mci.h b/arch/arm/mach-at91/include/mach/atmel-mci.h
>> index 998cb0c..cd580a1 100644
>> --- a/arch/arm/mach-at91/include/mach/atmel-mci.h
>> +++ b/arch/arm/mach-at91/include/mach/atmel-mci.h
>> @@ -1,7 +1,7 @@
>> #ifndef __MACH_ATMEL_MCI_H
>> #define __MACH_ATMEL_MCI_H
>>
>> -#include <mach/at_hdmac.h>
>> +#include <linux/platform_data/dma-atmel.h>
>>
>> /**
>> * struct mci_dma_data - DMA data for MCI interface
>> diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h
>> index 8a6c8e8..116e4ad 100644
>> --- a/drivers/dma/at_hdmac_regs.h
>> +++ b/drivers/dma/at_hdmac_regs.h
>> @@ -11,7 +11,7 @@
>> #ifndef AT_HDMAC_REGS_H
>> #define AT_HDMAC_REGS_H
>>
>> -#include <mach/at_hdmac.h>
>> +#include <linux/platform_data/dma-atmel.h>
>>
>> #define AT_DMA_MAX_NR_CHANNELS 8
>>
>> diff --git a/include/linux/platform_data/atmel-aes.h b/include/linux/platform_data/atmel-aes.h
>> index e7a1949..ab68082 100644
>> --- a/include/linux/platform_data/atmel-aes.h
>> +++ b/include/linux/platform_data/atmel-aes.h
>> @@ -1,7 +1,7 @@
>> #ifndef __LINUX_ATMEL_AES_H
>> #define __LINUX_ATMEL_AES_H
>>
>> -#include <mach/at_hdmac.h>
>> +#include <linux/platform_data/dma-atmel.h>
>>
>> /**
>> * struct aes_dma_data - DMA data for AES
>> diff --git a/arch/arm/mach-at91/include/mach/at_hdmac.h b/include/linux/platform_data/dma-atmel.h
>> similarity index 100%
>> rename from arch/arm/mach-at91/include/mach/at_hdmac.h
>> rename to include/linux/platform_data/dma-atmel.h
>> --
>> 1.7.10
>>
>
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 06/16] ARM: netx: move platform_data definitions
2012-09-11 12:59 ` [PATCH 06/16] ARM: netx: " Arnd Bergmann
@ 2012-09-11 13:35 ` Sascha Hauer
0 siblings, 0 replies; 69+ messages in thread
From: Sascha Hauer @ 2012-09-11 13:35 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, Russell King, netdev, linux-kernel, David S. Miller
On Tue, Sep 11, 2012 at 02:59:40PM +0200, 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 netx include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: netdev@vger.kernel.org
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> arch/arm/mach-netx/nxdb500.c | 2 +-
> arch/arm/mach-netx/nxdkn.c | 2 +-
> arch/arm/mach-netx/nxeb500hmi.c | 2 +-
> drivers/net/ethernet/netx-eth.c | 2 +-
> .../include/mach/eth.h => include/linux/platform_data/eth-netx.h | 0
> 5 files changed, 4 insertions(+), 4 deletions(-)
> rename arch/arm/mach-netx/include/mach/eth.h => include/linux/platform_data/eth-netx.h (100%)
>
> diff --git a/arch/arm/mach-netx/nxdb500.c b/arch/arm/mach-netx/nxdb500.c
> index 180ea89..8b781ff 100644
> --- a/arch/arm/mach-netx/nxdb500.c
> +++ b/arch/arm/mach-netx/nxdb500.c
> @@ -30,7 +30,7 @@
> #include <asm/mach/arch.h>
> #include <asm/hardware/vic.h>
> #include <mach/netx-regs.h>
> -#include <mach/eth.h>
> +#include <linux/platform_data/eth-netx.h>
>
> #include "generic.h"
> #include "fb.h"
> diff --git a/arch/arm/mach-netx/nxdkn.c b/arch/arm/mach-netx/nxdkn.c
> index 58009e2..b26dbce 100644
> --- a/arch/arm/mach-netx/nxdkn.c
> +++ b/arch/arm/mach-netx/nxdkn.c
> @@ -30,7 +30,7 @@
> #include <asm/mach/arch.h>
> #include <asm/hardware/vic.h>
> #include <mach/netx-regs.h>
> -#include <mach/eth.h>
> +#include <linux/platform_data/eth-netx.h>
>
> #include "generic.h"
>
> diff --git a/arch/arm/mach-netx/nxeb500hmi.c b/arch/arm/mach-netx/nxeb500hmi.c
> index 122e998..257382e 100644
> --- a/arch/arm/mach-netx/nxeb500hmi.c
> +++ b/arch/arm/mach-netx/nxeb500hmi.c
> @@ -30,7 +30,7 @@
> #include <asm/mach/arch.h>
> #include <asm/hardware/vic.h>
> #include <mach/netx-regs.h>
> -#include <mach/eth.h>
> +#include <linux/platform_data/eth-netx.h>
>
> #include "generic.h"
> #include "fb.h"
> diff --git a/drivers/net/ethernet/netx-eth.c b/drivers/net/ethernet/netx-eth.c
> index 9d11ab7..63e7af4 100644
> --- a/drivers/net/ethernet/netx-eth.c
> +++ b/drivers/net/ethernet/netx-eth.c
> @@ -34,7 +34,7 @@
> #include <mach/netx-regs.h>
> #include <mach/pfifo.h>
> #include <mach/xc.h>
> -#include <mach/eth.h>
> +#include <linux/platform_data/eth-netx.h>
>
> /* XC Fifo Offsets */
> #define EMPTY_PTR_FIFO(xcno) (0 + ((xcno) << 3)) /* Index of the empty pointer FIFO */
> diff --git a/arch/arm/mach-netx/include/mach/eth.h b/include/linux/platform_data/eth-netx.h
> similarity index 100%
> rename from arch/arm/mach-netx/include/mach/eth.h
> rename to include/linux/platform_data/eth-netx.h
> --
> 1.7.10
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 04/16] ARM: imx: move platform_data definitions
2012-09-11 12:59 ` [PATCH 04/16] ARM: imx: " Arnd Bergmann
@ 2012-09-11 13:40 ` Guennadi Liakhovetski
2012-09-11 14:10 ` Arnd Bergmann
2012-09-11 13:45 ` Sascha Hauer
2012-09-14 3:17 ` Vinod Koul
2 siblings, 1 reply; 69+ messages in thread
From: Guennadi Liakhovetski @ 2012-09-11 13:40 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Sascha Hauer,
Vinod Koul, Dan Williams, Ben Dooks (embedded platforms),
Wolfram Sang (embedded platforms),
Mauro Carvalho Chehab, Chris Ball, David Woodhouse, Grant Likely,
Alan Cox, Greg Kroah-Hartman, Felipe Balbi, Alan Stern,
Florian Tobias Schandinat, Liam Girdwood, Mark Brown,
Javier Martin, Shawn Guo
Hi Arnd
It probably wouldn't be very difficult to also include
arch/arm/plat-mxc/include/mach/ipu.h in this your patch, but you can also
leave it for later. Just to make sure it's not something that would make
your future patching more complicated.
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 04/16] ARM: imx: move platform_data definitions
2012-09-11 12:59 ` [PATCH 04/16] ARM: imx: " Arnd Bergmann
2012-09-11 13:40 ` Guennadi Liakhovetski
@ 2012-09-11 13:45 ` Sascha Hauer
2012-09-14 3:17 ` Vinod Koul
2 siblings, 0 replies; 69+ messages in thread
From: Sascha Hauer @ 2012-09-11 13:45 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, Wolfram Sang (embedded platforms),
Grant Likely, Russell King, Florian Tobias Schandinat,
Vinod Koul, Alan Stern, Chris Ball, Liam Girdwood,
Mauro Carvalho Chehab, Ben Dooks (embedded platforms),
Alan Cox, Greg Kroah-Hartman, Mark Brown, linux-kernel,
Felipe Balbi, Javier Martin, Sascha Hauer, Dan Williams,
Shawn Guo, David Woodhouse, Guennadi Liakhovetski
On Tue, Sep 11, 2012 at 02:59:38PM +0200, 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 imx include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Vinod Koul <vinod.koul@intel.com>
> Cc: Dan Williams <djbw@fb.com>
> Cc: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
> Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
> 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: Alan Cox <alan@linux.intel.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Felipe Balbi <balbi@ti.com>
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
> Cc: Liam Girdwood <lrg@ti.com>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Javier Martin <javier.martin@vista-silicon.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Both i.MX defconfigs still compile.
Sascha
> ---
> arch/arm/mach-imx/ehci-imx25.c | 2 +-
> arch/arm/mach-imx/ehci-imx27.c | 2 +-
> arch/arm/mach-imx/ehci-imx31.c | 2 +-
> arch/arm/mach-imx/ehci-imx35.c | 2 +-
> arch/arm/mach-imx/ehci-imx5.c | 2 +-
> arch/arm/mach-imx/mach-mx31moboard.c | 2 +-
> arch/arm/mach-imx/mx1-camera-fiq-ksym.c | 2 +-
> .../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 2 +-
> arch/arm/plat-mxc/include/mach/devices-common.h | 32 ++++++++++----------
> arch/arm/plat-mxc/ssi-fiq-ksym.c | 2 +-
> drivers/dma/imx-dma.c | 2 +-
> drivers/dma/imx-sdma.c | 4 +--
> drivers/i2c/busses/i2c-imx.c | 2 +-
> drivers/media/video/mx1_camera.c | 2 +-
> drivers/media/video/mx2_camera.c | 2 +-
> drivers/media/video/mx3_camera.c | 4 +--
> drivers/mmc/host/mxcmmc.c | 4 +--
> drivers/mmc/host/sdhci-esdhc-imx.c | 2 +-
> drivers/mtd/nand/mxc_nand.c | 2 +-
> drivers/spi/spi-imx.c | 2 +-
> drivers/tty/serial/imx.c | 2 +-
> drivers/usb/gadget/imx_udc.c | 2 +-
> drivers/usb/host/ehci-mxc.c | 2 +-
> drivers/usb/host/imx21-hcd.h | 2 +-
> drivers/video/imxfb.c | 2 +-
> drivers/video/mx3fb.c | 4 +--
> .../linux/platform_data/asoc-imx-ssi.h | 0
> .../linux/platform_data/camera-mx1.h | 0
> .../linux/platform_data/camera-mx2.h | 0
> .../linux/platform_data/camera-mx3.h | 0
> .../linux/platform_data/dma-imx-sdma.h | 0
> .../dma.h => include/linux/platform_data/dma-imx.h | 0
> .../i2c.h => include/linux/platform_data/i2c-imx.h | 0
> .../linux/platform_data/mmc-esdhc-imx.h | 0
> .../linux/platform_data/mmc-mxcmmc.h | 0
> .../linux/platform_data/mtd-mxc_nand.h | 0
> .../linux/platform_data/serial-imx.h | 0
> .../spi.h => include/linux/platform_data/spi-imx.h | 0
> .../linux/platform_data/usb-ehci-mxc.h | 0
> .../linux/platform_data/usb-imx_udc.h | 0
> .../linux/platform_data/usb-mx2.h | 0
> .../linux/platform_data/video-imxfb.h | 0
> .../linux/platform_data/video-mx3fb.h | 0
> sound/soc/fsl/imx-pcm-dma.c | 2 +-
> sound/soc/fsl/imx-pcm-fiq.c | 2 +-
> sound/soc/fsl/imx-ssi.c | 2 +-
> sound/soc/fsl/imx-ssi.h | 2 +-
> 47 files changed, 49 insertions(+), 49 deletions(-)
> rename arch/arm/plat-mxc/include/mach/ssi.h => include/linux/platform_data/asoc-imx-ssi.h (100%)
> rename arch/arm/plat-mxc/include/mach/mx1_camera.h => include/linux/platform_data/camera-mx1.h (100%)
> rename arch/arm/plat-mxc/include/mach/mx2_cam.h => include/linux/platform_data/camera-mx2.h (100%)
> rename arch/arm/plat-mxc/include/mach/mx3_camera.h => include/linux/platform_data/camera-mx3.h (100%)
> rename arch/arm/plat-mxc/include/mach/sdma.h => include/linux/platform_data/dma-imx-sdma.h (100%)
> rename arch/arm/plat-mxc/include/mach/dma.h => include/linux/platform_data/dma-imx.h (100%)
> rename arch/arm/plat-mxc/include/mach/i2c.h => include/linux/platform_data/i2c-imx.h (100%)
> rename arch/arm/plat-mxc/include/mach/esdhc.h => include/linux/platform_data/mmc-esdhc-imx.h (100%)
> rename arch/arm/plat-mxc/include/mach/mmc.h => include/linux/platform_data/mmc-mxcmmc.h (100%)
> rename arch/arm/plat-mxc/include/mach/mxc_nand.h => include/linux/platform_data/mtd-mxc_nand.h (100%)
> rename arch/arm/plat-mxc/include/mach/imx-uart.h => include/linux/platform_data/serial-imx.h (100%)
> rename arch/arm/plat-mxc/include/mach/spi.h => include/linux/platform_data/spi-imx.h (100%)
> rename arch/arm/plat-mxc/include/mach/mxc_ehci.h => include/linux/platform_data/usb-ehci-mxc.h (100%)
> rename arch/arm/plat-mxc/include/mach/usb.h => include/linux/platform_data/usb-imx_udc.h (100%)
> rename arch/arm/plat-mxc/include/mach/mx21-usbhost.h => include/linux/platform_data/usb-mx2.h (100%)
> rename arch/arm/plat-mxc/include/mach/imxfb.h => include/linux/platform_data/video-imxfb.h (100%)
> rename arch/arm/plat-mxc/include/mach/mx3fb.h => include/linux/platform_data/video-mx3fb.h (100%)
>
> diff --git a/arch/arm/mach-imx/ehci-imx25.c b/arch/arm/mach-imx/ehci-imx25.c
> index 05bb41d..412c583 100644
> --- a/arch/arm/mach-imx/ehci-imx25.c
> +++ b/arch/arm/mach-imx/ehci-imx25.c
> @@ -17,7 +17,7 @@
> #include <linux/io.h>
>
> #include <mach/hardware.h>
> -#include <mach/mxc_ehci.h>
> +#include <linux/platform_data/usb-ehci-mxc.h>
>
> #define USBCTRL_OTGBASE_OFFSET 0x600
>
> diff --git a/arch/arm/mach-imx/ehci-imx27.c b/arch/arm/mach-imx/ehci-imx27.c
> index fa69419..cd6e1f8 100644
> --- a/arch/arm/mach-imx/ehci-imx27.c
> +++ b/arch/arm/mach-imx/ehci-imx27.c
> @@ -17,7 +17,7 @@
> #include <linux/io.h>
>
> #include <mach/hardware.h>
> -#include <mach/mxc_ehci.h>
> +#include <linux/platform_data/usb-ehci-mxc.h>
>
> #define USBCTRL_OTGBASE_OFFSET 0x600
>
> diff --git a/arch/arm/mach-imx/ehci-imx31.c b/arch/arm/mach-imx/ehci-imx31.c
> index faad0f1..9a880c7 100644
> --- a/arch/arm/mach-imx/ehci-imx31.c
> +++ b/arch/arm/mach-imx/ehci-imx31.c
> @@ -17,7 +17,7 @@
> #include <linux/io.h>
>
> #include <mach/hardware.h>
> -#include <mach/mxc_ehci.h>
> +#include <linux/platform_data/usb-ehci-mxc.h>
>
> #define USBCTRL_OTGBASE_OFFSET 0x600
>
> diff --git a/arch/arm/mach-imx/ehci-imx35.c b/arch/arm/mach-imx/ehci-imx35.c
> index 73574c3..779e16e 100644
> --- a/arch/arm/mach-imx/ehci-imx35.c
> +++ b/arch/arm/mach-imx/ehci-imx35.c
> @@ -17,7 +17,7 @@
> #include <linux/io.h>
>
> #include <mach/hardware.h>
> -#include <mach/mxc_ehci.h>
> +#include <linux/platform_data/usb-ehci-mxc.h>
>
> #define USBCTRL_OTGBASE_OFFSET 0x600
>
> diff --git a/arch/arm/mach-imx/ehci-imx5.c b/arch/arm/mach-imx/ehci-imx5.c
> index a6a4afb..cf8d00e 100644
> --- a/arch/arm/mach-imx/ehci-imx5.c
> +++ b/arch/arm/mach-imx/ehci-imx5.c
> @@ -17,7 +17,7 @@
> #include <linux/io.h>
>
> #include <mach/hardware.h>
> -#include <mach/mxc_ehci.h>
> +#include <linux/platform_data/usb-ehci-mxc.h>
>
> #define MXC_OTG_OFFSET 0
> #define MXC_H1_OFFSET 0x200
> diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
> index d46290b..459e754 100644
> --- a/arch/arm/mach-imx/mach-mx31moboard.c
> +++ b/arch/arm/mach-imx/mach-mx31moboard.c
> @@ -47,7 +47,7 @@
> #include <mach/hardware.h>
> #include <mach/iomux-mx3.h>
> #include <mach/ulpi.h>
> -#include <mach/ssi.h>
> +#include <linux/platform_data/asoc-imx-ssi.h>
>
> #include "devices-imx31.h"
>
> diff --git a/arch/arm/mach-imx/mx1-camera-fiq-ksym.c b/arch/arm/mach-imx/mx1-camera-fiq-ksym.c
> index b09ee12..fb38436 100644
> --- a/arch/arm/mach-imx/mx1-camera-fiq-ksym.c
> +++ b/arch/arm/mach-imx/mx1-camera-fiq-ksym.c
> @@ -11,7 +11,7 @@
> #include <linux/platform_device.h>
> #include <linux/module.h>
>
> -#include <mach/mx1_camera.h>
> +#include <linux/platform_data/camera-mx1.h>
>
> /* IMX camera FIQ handler */
> EXPORT_SYMBOL(mx1_camera_sof_fiq_start);
> diff --git a/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c b/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c
> index 5955f5d..3793e47 100644
> --- a/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c
> +++ b/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c
> @@ -8,7 +8,7 @@
>
> #include <mach/hardware.h>
> #include <mach/devices-common.h>
> -#include <mach/esdhc.h>
> +#include <linux/platform_data/mmc-esdhc-imx.h>
>
> #define imx_sdhci_esdhc_imx_data_entry_single(soc, _devid, _id, hwid) \
> { \
> diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h
> index a7f5bb1..9e3e3d8 100644
> --- a/arch/arm/plat-mxc/include/mach/devices-common.h
> +++ b/arch/arm/plat-mxc/include/mach/devices-common.h
> @@ -9,7 +9,7 @@
> #include <linux/kernel.h>
> #include <linux/platform_device.h>
> #include <linux/init.h>
> -#include <mach/sdma.h>
> +#include <linux/platform_data/dma-imx-sdma.h>
>
> extern struct device mxc_aips_bus;
> extern struct device mxc_ahb_bus;
> @@ -74,7 +74,7 @@ struct platform_device *__init imx_add_fsl_usb2_udc(
> struct platform_device *__init imx_add_gpio_keys(
> const struct gpio_keys_platform_data *pdata);
>
> -#include <mach/mx21-usbhost.h>
> +#include <linux/platform_data/usb-mx2.h>
> struct imx_imx21_hcd_data {
> resource_size_t iobase;
> resource_size_t irq;
> @@ -98,7 +98,7 @@ struct imx_imxdi_rtc_data {
> struct platform_device *__init imx_add_imxdi_rtc(
> const struct imx_imxdi_rtc_data *data);
>
> -#include <mach/imxfb.h>
> +#include <linux/platform_data/video-imxfb.h>
> struct imx_imx_fb_data {
> resource_size_t iobase;
> resource_size_t iosize;
> @@ -108,7 +108,7 @@ struct platform_device *__init imx_add_imx_fb(
> const struct imx_imx_fb_data *data,
> const struct imx_fb_platform_data *pdata);
>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-imx.h>
> struct imx_imx_i2c_data {
> int id;
> resource_size_t iobase;
> @@ -129,7 +129,7 @@ struct platform_device *__init imx_add_imx_keypad(
> const struct imx_imx_keypad_data *data,
> const struct matrix_keymap_data *pdata);
>
> -#include <mach/ssi.h>
> +#include <linux/platform_data/asoc-imx-ssi.h>
> struct imx_imx_ssi_data {
> int id;
> resource_size_t iobase;
> @@ -144,7 +144,7 @@ struct platform_device *__init imx_add_imx_ssi(
> const struct imx_imx_ssi_data *data,
> const struct imx_ssi_platform_data *pdata);
>
> -#include <mach/imx-uart.h>
> +#include <linux/platform_data/serial-imx.h>
> struct imx_imx_uart_3irq_data {
> int id;
> resource_size_t iobase;
> @@ -167,7 +167,7 @@ struct platform_device *__init imx_add_imx_uart_1irq(
> const struct imx_imx_uart_1irq_data *data,
> const struct imxuart_platform_data *pdata);
>
> -#include <mach/usb.h>
> +#include <linux/platform_data/usb-imx_udc.h>
> struct imx_imx_udc_data {
> resource_size_t iobase;
> resource_size_t iosize;
> @@ -183,8 +183,8 @@ struct platform_device *__init imx_add_imx_udc(
> const struct imx_imx_udc_data *data,
> const struct imxusb_platform_data *pdata);
>
> -#include <mach/mx3fb.h>
> -#include <mach/mx3_camera.h>
> +#include <linux/platform_data/video-mx3fb.h>
> +#include <linux/platform_data/camera-mx3.h>
> struct imx_ipu_core_data {
> resource_size_t iobase;
> resource_size_t synirq;
> @@ -199,7 +199,7 @@ struct platform_device *__init imx_add_mx3_sdc_fb(
> const struct imx_ipu_core_data *data,
> struct mx3fb_platform_data *pdata);
>
> -#include <mach/mx1_camera.h>
> +#include <linux/platform_data/camera-mx1.h>
> struct imx_mx1_camera_data {
> resource_size_t iobase;
> resource_size_t iosize;
> @@ -209,7 +209,7 @@ struct platform_device *__init imx_add_mx1_camera(
> const struct imx_mx1_camera_data *data,
> const struct mx1_camera_pdata *pdata);
>
> -#include <mach/mx2_cam.h>
> +#include <linux/platform_data/camera-mx2.h>
> struct imx_mx2_camera_data {
> resource_size_t iobasecsi;
> resource_size_t iosizecsi;
> @@ -224,7 +224,7 @@ struct platform_device *__init imx_add_mx2_camera(
> struct platform_device *__init imx_add_mx2_emmaprp(
> const struct imx_mx2_camera_data *data);
>
> -#include <mach/mxc_ehci.h>
> +#include <linux/platform_data/usb-ehci-mxc.h>
> struct imx_mxc_ehci_data {
> int id;
> resource_size_t iobase;
> @@ -234,7 +234,7 @@ struct platform_device *__init imx_add_mxc_ehci(
> const struct imx_mxc_ehci_data *data,
> const struct mxc_usbh_platform_data *pdata);
>
> -#include <mach/mmc.h>
> +#include <linux/platform_data/mmc-mxcmmc.h>
> struct imx_mxc_mmc_data {
> int id;
> resource_size_t iobase;
> @@ -246,7 +246,7 @@ struct platform_device *__init imx_add_mxc_mmc(
> const struct imx_mxc_mmc_data *data,
> const struct imxmmc_platform_data *pdata);
>
> -#include <mach/mxc_nand.h>
> +#include <linux/platform_data/mtd-mxc_nand.h>
> struct imx_mxc_nand_data {
> /*
> * id is traditionally 0, but -1 is more appropriate. We use -1 for new
> @@ -295,7 +295,7 @@ struct imx_mxc_w1_data {
> struct platform_device *__init imx_add_mxc_w1(
> const struct imx_mxc_w1_data *data);
>
> -#include <mach/esdhc.h>
> +#include <linux/platform_data/mmc-esdhc-imx.h>
> struct imx_sdhci_esdhc_imx_data {
> const char *devid;
> int id;
> @@ -306,7 +306,7 @@ struct platform_device *__init imx_add_sdhci_esdhc_imx(
> const struct imx_sdhci_esdhc_imx_data *data,
> const struct esdhc_platform_data *pdata);
>
> -#include <mach/spi.h>
> +#include <linux/platform_data/spi-imx.h>
> struct imx_spi_imx_data {
> const char *devid;
> int id;
> diff --git a/arch/arm/plat-mxc/ssi-fiq-ksym.c b/arch/arm/plat-mxc/ssi-fiq-ksym.c
> index b5fad45..792090f 100644
> --- a/arch/arm/plat-mxc/ssi-fiq-ksym.c
> +++ b/arch/arm/plat-mxc/ssi-fiq-ksym.c
> @@ -10,7 +10,7 @@
>
> #include <linux/module.h>
>
> -#include <mach/ssi.h>
> +#include <linux/platform_data/asoc-imx-ssi.h>
>
> EXPORT_SYMBOL(imx_ssi_fiq_tx_buffer);
> EXPORT_SYMBOL(imx_ssi_fiq_rx_buffer);
> diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
> index 5084975..b90aaec 100644
> --- a/drivers/dma/imx-dma.c
> +++ b/drivers/dma/imx-dma.c
> @@ -28,7 +28,7 @@
> #include <linux/module.h>
>
> #include <asm/irq.h>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-imx.h>
> #include <mach/hardware.h>
>
> #include "dmaengine.h"
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> index 1dc2a4a..1b781d6 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -38,8 +38,8 @@
> #include <linux/of_device.h>
>
> #include <asm/irq.h>
> -#include <mach/sdma.h>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-imx-sdma.h>
> +#include <linux/platform_data/dma-imx.h>
> #include <mach/hardware.h>
>
> #include "dmaengine.h"
> diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
> index 0722f86..b7907ba7 100644
> --- a/drivers/i2c/busses/i2c-imx.c
> +++ b/drivers/i2c/busses/i2c-imx.c
> @@ -54,7 +54,7 @@
> #include <linux/pinctrl/consumer.h>
>
> #include <mach/hardware.h>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-imx.h>
>
> /** Defines ********************************************************************
> *******************************************************************************/
> diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c
> index 560a65a..bbe7099 100644
> --- a/drivers/media/video/mx1_camera.c
> +++ b/drivers/media/video/mx1_camera.c
> @@ -44,7 +44,7 @@
> #include <mach/dma-mx1-mx2.h>
> #include <mach/hardware.h>
> #include <mach/irqs.h>
> -#include <mach/mx1_camera.h>
> +#include <linux/platform_data/camera-mx1.h>
>
> /*
> * CSI registers
> diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c
> index ac17540..965427f 100644
> --- a/drivers/media/video/mx2_camera.c
> +++ b/drivers/media/video/mx2_camera.c
> @@ -40,7 +40,7 @@
>
> #include <linux/videodev2.h>
>
> -#include <mach/mx2_cam.h>
> +#include <linux/platform_data/camera-mx2.h>
> #include <mach/hardware.h>
>
> #include <asm/dma.h>
> diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c
> index af2297d..1481b0d 100644
> --- a/drivers/media/video/mx3_camera.c
> +++ b/drivers/media/video/mx3_camera.c
> @@ -25,8 +25,8 @@
> #include <media/soc_mediabus.h>
>
> #include <mach/ipu.h>
> -#include <mach/mx3_camera.h>
> -#include <mach/dma.h>
> +#include <linux/platform_data/camera-mx3.h>
> +#include <linux/platform_data/dma-imx.h>
>
> #define MX3_CAM_DRV_NAME "mx3-camera"
>
> diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
> index 28ed52d..7b1161d 100644
> --- a/drivers/mmc/host/mxcmmc.c
> +++ b/drivers/mmc/host/mxcmmc.c
> @@ -38,9 +38,9 @@
> #include <asm/dma.h>
> #include <asm/irq.h>
> #include <asm/sizes.h>
> -#include <mach/mmc.h>
> +#include <linux/platform_data/mmc-mxcmmc.h>
>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-imx.h>
> #include <mach/hardware.h>
>
> #define DRIVER_NAME "mxc-mmc"
> diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
> index e23f813..c4c504c 100644
> --- a/drivers/mmc/host/sdhci-esdhc-imx.c
> +++ b/drivers/mmc/host/sdhci-esdhc-imx.c
> @@ -25,7 +25,7 @@
> #include <linux/of_device.h>
> #include <linux/of_gpio.h>
> #include <linux/pinctrl/consumer.h>
> -#include <mach/esdhc.h>
> +#include <linux/platform_data/mmc-esdhc-imx.h>
> #include "sdhci-pltfm.h"
> #include "sdhci-esdhc.h"
>
> diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
> index 6acc790..5683604 100644
> --- a/drivers/mtd/nand/mxc_nand.c
> +++ b/drivers/mtd/nand/mxc_nand.c
> @@ -36,7 +36,7 @@
> #include <linux/of_mtd.h>
>
> #include <asm/mach/flash.h>
> -#include <mach/mxc_nand.h>
> +#include <linux/platform_data/mtd-mxc_nand.h>
> #include <mach/hardware.h>
>
> #define DRIVER_NAME "mxc_nand"
> diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
> index e834ff8..63e7fc9 100644
> --- a/drivers/spi/spi-imx.c
> +++ b/drivers/spi/spi-imx.c
> @@ -39,7 +39,7 @@
> #include <linux/of_gpio.h>
> #include <linux/pinctrl/consumer.h>
>
> -#include <mach/spi.h>
> +#include <linux/platform_data/spi-imx.h>
>
> #define DRIVER_NAME "spi_imx"
>
> diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
> index d5c689d6..fc65ba2 100644
> --- a/drivers/tty/serial/imx.c
> +++ b/drivers/tty/serial/imx.c
> @@ -51,7 +51,7 @@
>
> #include <asm/io.h>
> #include <asm/irq.h>
> -#include <mach/imx-uart.h>
> +#include <linux/platform_data/serial-imx.h>
>
> /* Register definitions */
> #define URXD0 0x0 /* Receiver Register */
> diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c
> index dc53348..a0eb857 100644
> --- a/drivers/usb/gadget/imx_udc.c
> +++ b/drivers/usb/gadget/imx_udc.c
> @@ -35,7 +35,7 @@
> #include <linux/usb/ch9.h>
> #include <linux/usb/gadget.h>
>
> -#include <mach/usb.h>
> +#include <linux/platform_data/usb-imx_udc.h>
> #include <mach/hardware.h>
>
> #include "imx_udc.h"
> diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
> index 3420137..a6e2ea4 100644
> --- a/drivers/usb/host/ehci-mxc.c
> +++ b/drivers/usb/host/ehci-mxc.c
> @@ -25,7 +25,7 @@
> #include <linux/slab.h>
>
> #include <mach/hardware.h>
> -#include <mach/mxc_ehci.h>
> +#include <linux/platform_data/usb-ehci-mxc.h>
>
> #include <asm/mach-types.h>
>
> diff --git a/drivers/usb/host/imx21-hcd.h b/drivers/usb/host/imx21-hcd.h
> index 87b29fd..c005770 100644
> --- a/drivers/usb/host/imx21-hcd.h
> +++ b/drivers/usb/host/imx21-hcd.h
> @@ -24,7 +24,7 @@
> #ifndef __LINUX_IMX21_HCD_H__
> #define __LINUX_IMX21_HCD_H__
>
> -#include <mach/mx21-usbhost.h>
> +#include <linux/platform_data/usb-mx2.h>
>
> #define NUM_ISO_ETDS 2
> #define USB_NUM_ETD 32
> diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
> index caad368..53ffdfc 100644
> --- a/drivers/video/imxfb.c
> +++ b/drivers/video/imxfb.c
> @@ -32,7 +32,7 @@
> #include <linux/io.h>
> #include <linux/math64.h>
>
> -#include <mach/imxfb.h>
> +#include <linux/platform_data/video-imxfb.h>
> #include <mach/hardware.h>
>
> /*
> diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
> index c89f8a8..d738108 100644
> --- a/drivers/video/mx3fb.c
> +++ b/drivers/video/mx3fb.c
> @@ -27,10 +27,10 @@
> #include <linux/clk.h>
> #include <linux/mutex.h>
>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-imx.h>
> #include <mach/hardware.h>
> #include <mach/ipu.h>
> -#include <mach/mx3fb.h>
> +#include <linux/platform_data/video-mx3fb.h>
>
> #include <asm/io.h>
> #include <asm/uaccess.h>
> diff --git a/arch/arm/plat-mxc/include/mach/ssi.h b/include/linux/platform_data/asoc-imx-ssi.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/ssi.h
> rename to include/linux/platform_data/asoc-imx-ssi.h
> diff --git a/arch/arm/plat-mxc/include/mach/mx1_camera.h b/include/linux/platform_data/camera-mx1.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/mx1_camera.h
> rename to include/linux/platform_data/camera-mx1.h
> diff --git a/arch/arm/plat-mxc/include/mach/mx2_cam.h b/include/linux/platform_data/camera-mx2.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/mx2_cam.h
> rename to include/linux/platform_data/camera-mx2.h
> diff --git a/arch/arm/plat-mxc/include/mach/mx3_camera.h b/include/linux/platform_data/camera-mx3.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/mx3_camera.h
> rename to include/linux/platform_data/camera-mx3.h
> diff --git a/arch/arm/plat-mxc/include/mach/sdma.h b/include/linux/platform_data/dma-imx-sdma.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/sdma.h
> rename to include/linux/platform_data/dma-imx-sdma.h
> diff --git a/arch/arm/plat-mxc/include/mach/dma.h b/include/linux/platform_data/dma-imx.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/dma.h
> rename to include/linux/platform_data/dma-imx.h
> diff --git a/arch/arm/plat-mxc/include/mach/i2c.h b/include/linux/platform_data/i2c-imx.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/i2c.h
> rename to include/linux/platform_data/i2c-imx.h
> diff --git a/arch/arm/plat-mxc/include/mach/esdhc.h b/include/linux/platform_data/mmc-esdhc-imx.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/esdhc.h
> rename to include/linux/platform_data/mmc-esdhc-imx.h
> diff --git a/arch/arm/plat-mxc/include/mach/mmc.h b/include/linux/platform_data/mmc-mxcmmc.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/mmc.h
> rename to include/linux/platform_data/mmc-mxcmmc.h
> diff --git a/arch/arm/plat-mxc/include/mach/mxc_nand.h b/include/linux/platform_data/mtd-mxc_nand.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/mxc_nand.h
> rename to include/linux/platform_data/mtd-mxc_nand.h
> diff --git a/arch/arm/plat-mxc/include/mach/imx-uart.h b/include/linux/platform_data/serial-imx.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/imx-uart.h
> rename to include/linux/platform_data/serial-imx.h
> diff --git a/arch/arm/plat-mxc/include/mach/spi.h b/include/linux/platform_data/spi-imx.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/spi.h
> rename to include/linux/platform_data/spi-imx.h
> diff --git a/arch/arm/plat-mxc/include/mach/mxc_ehci.h b/include/linux/platform_data/usb-ehci-mxc.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/mxc_ehci.h
> rename to include/linux/platform_data/usb-ehci-mxc.h
> diff --git a/arch/arm/plat-mxc/include/mach/usb.h b/include/linux/platform_data/usb-imx_udc.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/usb.h
> rename to include/linux/platform_data/usb-imx_udc.h
> diff --git a/arch/arm/plat-mxc/include/mach/mx21-usbhost.h b/include/linux/platform_data/usb-mx2.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/mx21-usbhost.h
> rename to include/linux/platform_data/usb-mx2.h
> diff --git a/arch/arm/plat-mxc/include/mach/imxfb.h b/include/linux/platform_data/video-imxfb.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/imxfb.h
> rename to include/linux/platform_data/video-imxfb.h
> diff --git a/arch/arm/plat-mxc/include/mach/mx3fb.h b/include/linux/platform_data/video-mx3fb.h
> similarity index 100%
> rename from arch/arm/plat-mxc/include/mach/mx3fb.h
> rename to include/linux/platform_data/video-mx3fb.h
> diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c
> index 48f9d88..89a7755 100644
> --- a/sound/soc/fsl/imx-pcm-dma.c
> +++ b/sound/soc/fsl/imx-pcm-dma.c
> @@ -30,7 +30,7 @@
> #include <sound/soc.h>
> #include <sound/dmaengine_pcm.h>
>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-imx.h>
>
> #include "imx-pcm.h"
>
> diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c
> index ee27ba3..22c6130 100644
> --- a/sound/soc/fsl/imx-pcm-fiq.c
> +++ b/sound/soc/fsl/imx-pcm-fiq.c
> @@ -30,7 +30,7 @@
> #include <asm/fiq.h>
>
> #include <mach/irqs.h>
> -#include <mach/ssi.h>
> +#include <linux/platform_data/asoc-imx-ssi.h>
>
> #include "imx-ssi.h"
>
> diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
> index 81d7728..e6a17ba 100644
> --- a/sound/soc/fsl/imx-ssi.c
> +++ b/sound/soc/fsl/imx-ssi.c
> @@ -47,7 +47,7 @@
> #include <sound/pcm_params.h>
> #include <sound/soc.h>
>
> -#include <mach/ssi.h>
> +#include <linux/platform_data/asoc-imx-ssi.h>
> #include <mach/hardware.h>
>
> #include "imx-ssi.h"
> diff --git a/sound/soc/fsl/imx-ssi.h b/sound/soc/fsl/imx-ssi.h
> index 5744e86..dc114bd 100644
> --- a/sound/soc/fsl/imx-ssi.h
> +++ b/sound/soc/fsl/imx-ssi.h
> @@ -186,7 +186,7 @@
> #define DRV_NAME "imx-ssi"
>
> #include <linux/dmaengine.h>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-imx.h>
> #include "imx-pcm.h"
>
> struct imx_ssi {
> --
> 1.7.10
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 12/16] ARM: nomadik: move platform_data definitions
2012-09-11 13:31 ` Linus Walleij
@ 2012-09-11 13:46 ` Arnd Bergmann
2012-09-12 16:24 ` Arnd Bergmann
1 sibling, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 13:46 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-arm-kernel, linux-kernel, Russell King, Alessandro Rubini,
STEricsson, Srinidhi Kasagar, Herbert Xu, David S. Miller,
Dmitry Torokhov, David Woodhouse, Felipe Balbi,
Greg Kroah-Hartman, Andreas Westin
On Tuesday 11 September 2012, Linus Walleij wrote:
> On Tue, Sep 11, 2012 at 5:59 AM, Arnd Bergmann <arnd@arndb.de> wrote:
>
> > arch/arm/mach-nomadik/board-nhk8815.c | 2 +-
> > arch/arm/mach-u300/core.c | 2 +-
> > arch/arm/mach-ux500/board-mop500.c | 2 +-
> > arch/arm/mach-ux500/cpu-db8500.c | 2 +-
> > arch/arm/mach-ux500/devices-common.h | 2 +-
> > arch/arm/mach-ux500/usb.c | 2 +-
> > drivers/crypto/ux500/cryp/cryp_core.c | 2 +-
> > drivers/crypto/ux500/hash/hash_core.c | 2 +-
> > drivers/input/keyboard/nomadik-ske-keypad.c | 2 +-
> > drivers/mtd/nand/nomadik_nand.c | 2 +-
> > drivers/pinctrl/pinctrl-coh901.c | 2 +-
> > drivers/usb/musb/ux500_dma.c | 2 +-
> > .../include/mach => include/linux/platform_data}/crypto-ux500.h | 0
> > .../plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h | 0
> > .../mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h | 0
> > .../mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h | 0
>
> I sent a patch for moving gpio-u300.h like this in commit
> 651728507140246e9cf4e809f1877cb2eddbc84e
> that is already in linux-next, is this the same patch or
> another one?
This my older patch that I did before the mini summit, but had not sent
out yet. It's probably best if I just drop this part of the patch.
Arnd
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 13/16] ARM: omap: move platform_data definitions
2012-09-11 12:59 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
@ 2012-09-11 13:52 ` Peter Ujfalusi
2012-09-12 17:20 ` Arnd Bergmann
2012-09-12 7:16 ` Pihet-XID, Jean
1 sibling, 1 reply; 69+ messages in thread
From: Peter Ujfalusi @ 2012-09-11 13:52 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Tony Lindgren,
Kevin Hilman, Benoît Cousson, Dmitry Torokhov,
David Woodhouse, Kyungmin Park, Ohad Ben-Cohen, Grant Likely,
Omar Ramirez Luna, Greg Kroah-Hartman, Tomi Valkeinen,
Florian Tobias Schandinat, Jarkko Nikula, Liam Girdwood,
Mark Brown, Artem Bityutskiy, Jean Pihet, J Keerthy, linux-omap
Hi Arnd,
On 09/11/2012 03:59 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 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
OMAP McBSP has nothing to do with a dsp.
A better name would be: ti-mcbsp.h (or leave it as mcbsp.h)
McBSP stands for: Multichannel Buffered Serial Port and it is used for audio
connection (I2S, TDM, etc).
> .../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 +-
Let me see these:
This four drivers are going to be removed via sound tree.
> sound/soc/omap/igep0020.c | 2 +-
> sound/soc/omap/omap3beagle.c | 2 +-
> sound/soc/omap/omap3evm.c | 2 +-
> sound/soc/omap/overo.c | 2 +-
The new driver which replaces these (omap-twl4030.c) does not include
plat/mcbsp.h
>From these ASoC machine drivers you can just remove the <plat/mcbsp.h>
include since they should not include them (I have pending patch for this to
be sent):
> sound/soc/omap/am3517evm.c | 2 +-
> sound/soc/omap/ams-delta.c | 2 +-
> sound/soc/omap/n810.c | 2 +-
> sound/soc/omap/omap3pandora.c | 2 +-
> sound/soc/omap/osk5912.c | 2 +-
> sound/soc/omap/rx51.c | 2 +-
> sound/soc/omap/sdp3430.c | 2 +-
> sound/soc/omap/zoom2.c | 2 +-
> sound/soc/omap/omap-mcbsp.c | 2 +-
> sound/soc/omap/mcbsp.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%)
--
Péter
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 13/16] ARM: omap: move platform_data definitions
2012-09-11 13:02 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
` (2 preceding siblings ...)
2012-09-11 13:02 ` [PATCH 16/16] ARM: spear: " Arnd Bergmann
@ 2012-09-11 14:06 ` Shilimkar, Santosh
2012-09-11 14:17 ` Arnd Bergmann
3 siblings, 1 reply; 69+ messages in thread
From: Shilimkar, Santosh @ 2012-09-11 14:06 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Tony Lindgren,
Kevin Hilman, Benoît Cousson, Dmitry Torokhov,
David Woodhouse, Kyungmin Park, Ohad Ben-Cohen, Grant Likely,
Omar Ramirez Luna, Greg Kroah-Hartman, Tomi Valkeinen,
Florian Tobias Schandinat, Peter Ujfalusi, Jarkko Nikula,
Liam Girdwood, Mark Brown, Artem Bityutskiy, Jean Pihet,
J Keerthy, linux-omap
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
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 04/16] ARM: imx: move platform_data definitions
2012-09-11 13:40 ` Guennadi Liakhovetski
@ 2012-09-11 14:10 ` Arnd Bergmann
2012-09-11 14:31 ` Guennadi Liakhovetski
0 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 14:10 UTC (permalink / raw)
To: Guennadi Liakhovetski
Cc: linux-arm-kernel, linux-kernel, Russell King, Sascha Hauer,
Vinod Koul, Dan Williams, Ben Dooks (embedded platforms),
Wolfram Sang (embedded platforms),
Mauro Carvalho Chehab, Chris Ball, David Woodhouse, Grant Likely,
Alan Cox, Greg Kroah-Hartman, Felipe Balbi, Alan Stern,
Florian Tobias Schandinat, Liam Girdwood, Mark Brown,
Javier Martin, Shawn Guo
On Tuesday 11 September 2012, Guennadi Liakhovetski wrote:
> Hi Arnd
>
> It probably wouldn't be very difficult to also include
> arch/arm/plat-mxc/include/mach/ipu.h in this your patch, but you can also
> leave it for later. Just to make sure it's not something that would make
> your future patching more complicated.
>
For now, I've done only the straight renames but left the ones that looked
like they need more complex changes of any sort. Looking at ipu.h, it seems
that this header file defines data that is used inside of the driver but not
in the platform device definition, so we'd need to split it up and move
the part that is only used inside of the driver into a different place.
Of course, I could alo be mistaken and not have realized that actually all
of this file is platform data.
Arnd
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 13/16] ARM: omap: move platform_data definitions
2012-09-11 14:06 ` [PATCH 13/16] ARM: omap: " Shilimkar, Santosh
@ 2012-09-11 14:17 ` Arnd Bergmann
2012-09-11 14:24 ` Shilimkar, Santosh
0 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 14:17 UTC (permalink / raw)
To: Shilimkar, Santosh
Cc: linux-arm-kernel, linux-kernel, Russell King, Tony Lindgren,
Kevin Hilman, Benoît Cousson, Dmitry Torokhov,
David Woodhouse, Kyungmin Park, Ohad Ben-Cohen, Grant Likely,
Omar Ramirez Luna, Greg Kroah-Hartman, Tomi Valkeinen,
Florian Tobias Schandinat, Peter Ujfalusi, Jarkko Nikula,
Liam Girdwood, Mark Brown, Artem Bityutskiy, Jean Pihet,
J Keerthy, linux-omap
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
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 13/16] ARM: omap: move platform_data definitions
2012-09-11 14:17 ` Arnd Bergmann
@ 2012-09-11 14:24 ` Shilimkar, Santosh
2012-09-11 16:09 ` Vaibhav Hiremath
0 siblings, 1 reply; 69+ messages in thread
From: Shilimkar, Santosh @ 2012-09-11 14:24 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Tony Lindgren,
Kevin Hilman, Benoît Cousson, Dmitry Torokhov,
David Woodhouse, Kyungmin Park, Ohad Ben-Cohen, Grant Likely,
Omar Ramirez Luna, Greg Kroah-Hartman, Tomi Valkeinen,
Florian Tobias Schandinat, Peter Ujfalusi, Jarkko Nikula,
Liam Girdwood, Mark Brown, Artem Bityutskiy, Jean Pihet,
J Keerthy, linux-omap
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
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 04/16] ARM: imx: move platform_data definitions
2012-09-11 14:10 ` Arnd Bergmann
@ 2012-09-11 14:31 ` Guennadi Liakhovetski
2012-09-12 15:52 ` Arnd Bergmann
0 siblings, 1 reply; 69+ messages in thread
From: Guennadi Liakhovetski @ 2012-09-11 14:31 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Sascha Hauer,
Vinod Koul, Dan Williams, Ben Dooks (embedded platforms),
Wolfram Sang (embedded platforms),
Mauro Carvalho Chehab, Chris Ball, David Woodhouse, Grant Likely,
Alan Cox, Greg Kroah-Hartman, Felipe Balbi, Alan Stern,
Florian Tobias Schandinat, Liam Girdwood, Mark Brown,
Javier Martin, Shawn Guo
On Tue, 11 Sep 2012, Arnd Bergmann wrote:
> On Tuesday 11 September 2012, Guennadi Liakhovetski wrote:
> > Hi Arnd
> >
> > It probably wouldn't be very difficult to also include
> > arch/arm/plat-mxc/include/mach/ipu.h in this your patch, but you can also
> > leave it for later. Just to make sure it's not something that would make
> > your future patching more complicated.
> >
>
> For now, I've done only the straight renames but left the ones that looked
> like they need more complex changes of any sort. Looking at ipu.h, it seems
> that this header file defines data that is used inside of the driver but not
> in the platform device definition, so we'd need to split it up and move
> the part that is only used inside of the driver into a different place.
>
> Of course, I could alo be mistaken and not have realized that actually all
> of this file is platform data.
ipu.h is used by the dmaengine and IRQ driver under drivers/dma/ipu/, and
by its users drivers/media/platform/soc_camera/mx3_camera.c and
drivers/video/mx3fb.c. It has been placed under arch/arm/... because it's
arch-specific, but in principle I don't see any reason why it cannot
happily live anywhere under include/...
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 09/16] ARM: tegra: move platform_data definitions
2012-09-11 12:59 ` [PATCH 09/16] ARM: tegra: " Arnd Bergmann
@ 2012-09-11 15:35 ` Stephen Warren
2012-09-12 16:21 ` Arnd Bergmann
2012-09-11 15:42 ` Chris Ball
1 sibling, 1 reply; 69+ messages in thread
From: Stephen Warren @ 2012-09-11 15:35 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, Mark Brown, Russell King, Dmitry Torokhov,
linux-kernel, linux-tegra, Colin Cross, Olof Johansson,
Chris Ball, Liam Girdwood
On 09/11/2012 06:59 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 tegra include directories
I have already submitted patches for some of these:
> .../linux/platform_data/asoc-tegra_wm8903.h | 0
03f6743 ASoC: tegra: move platform data header
This moves the file to include/sound/tegra_wm8903.h, which seems
consistent with other sound-related platform data.
> .../mach/kbc.h => include/linux/platform_data/keyboard-tegra-kbc.h | 0
a85442a Input: tegra - move platform data header
This moves the file to include/linux/input/tegra_kbc.h, which seems
consistent with other input-related platform data.
> .../mach/sdhci.h => include/linux/platform_data/mmc-sdhci-tegra.h | 0
I have a not-yet-applied (but ack'd by Chris Ball) patch to move this to
include/linux/mmc/tegra_sdhci.h. I believe all the dependencies are
staged in the Tegra tree now, so I can apply it if you want. I'm fine
with you apply this patch though; just let me know. If you want to take
your patch, then this part:
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 09/16] ARM: tegra: move platform_data definitions
2012-09-11 12:59 ` [PATCH 09/16] ARM: tegra: " Arnd Bergmann
2012-09-11 15:35 ` Stephen Warren
@ 2012-09-11 15:42 ` Chris Ball
2012-09-11 17:05 ` Arnd Bergmann
1 sibling, 1 reply; 69+ messages in thread
From: Chris Ball @ 2012-09-11 15:42 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Colin Cross,
Olof Johansson, Stephen Warren, Dmitry Torokhov, Liam Girdwood,
Mark Brown, linux-tegra
Hi Arnd,
On Tue, Sep 11 2012, Arnd Bergmann wrote:
> diff --git a/arch/arm/mach-tegra/include/mach/sdhci.h
> b/include/linux/platform_data/mmc-sdhci-tegra.h
> similarity index 100%
> rename from arch/arm/mach-tegra/include/mach/sdhci.h
> rename to include/linux/platform_data/mmc-sdhci-tegra.h
Looks like you aren't renaming the idempotency guards, so e.g.
include/linux/platform_data/mmc-sdhci-tegra.h will contain:
#ifndef __ASM_ARM_ARCH_TEGRA_SDHCI_H
#define __ASM_ARM_ARCH_TEGRA_SDHCI_H
Is that intentional? Thanks,
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 13/16] ARM: omap: move platform_data definitions
2012-09-11 14:24 ` Shilimkar, Santosh
@ 2012-09-11 16:09 ` Vaibhav Hiremath
2012-09-11 17:04 ` Arnd Bergmann
0 siblings, 1 reply; 69+ messages in thread
From: Vaibhav Hiremath @ 2012-09-11 16:09 UTC (permalink / raw)
To: Shilimkar, Santosh
Cc: Arnd Bergmann, Dmitry Torokhov, Tony Lindgren, Artem Bityutskiy,
Peter Ujfalusi, Kevin Hilman, Omar Ramirez Luna, Russell King,
Florian Tobias Schandinat, Tomi Valkeinen, Jean Pihet,
Ohad Ben-Cohen, linux-omap, linux-arm-kernel, Grant Likely,
Benoît Cousson, Greg Kroah-Hartman, Mark Brown,
linux-kernel, Liam Girdwood, Kyungmin Park, J Keerthy,
David Woodhouse, Jarkko Nikula
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
>
^ permalink raw reply [flat|nested] 69+ messages in thread
* RE: [PATCH 03/16] ARM: ep93xx: move platform_data definitions
2012-09-11 12:59 ` [PATCH 03/16] ARM: ep93xx: " Arnd Bergmann
@ 2012-09-11 16:26 ` H Hartley Sweeten
2012-09-11 17:16 ` Arnd Bergmann
2012-09-11 22:56 ` Ryan Mallon
2012-09-14 3:18 ` Vinod Koul
2 siblings, 1 reply; 69+ messages in thread
From: H Hartley Sweeten @ 2012-09-11 16:26 UTC (permalink / raw)
To: Arnd Bergmann, linux-arm-kernel
Cc: linux-kernel, Russell King, Grant Likely, Ryan Mallon,
Vinod Koul, Dan Williams, Florian Tobias Schandinat,
Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
Mika Westerberg, Axel Lin
On Tuesday, September 11, 2012 6:00 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 ep93xx include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Ryan Mallon <rmallon@gmail.com>
> Cc: Jeff Garzik <jgarzik@pobox.com> (supporter:SERIAL ATA
> Cc: Vinod Koul <vinod.koul@intel.com>
> Cc: Dan Williams <djbw@fb.com>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> (maintainer:INPUT
> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
> Cc: Liam Girdwood <lrg@ti.com>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Jaroslav Kysela <perex@perex.cz>
> Cc: Takashi Iwai <tiwai@suse.de>
> Cc: Mika Westerberg <mika.westerberg@iki.fi>
> Cc: Axel Lin <axel.lin@gmail.com>
> ---
> Documentation/spi/ep93xx_spi | 2 +-
> arch/arm/mach-ep93xx/core.c | 6 +++---
> arch/arm/mach-ep93xx/dma.c | 2 +-
> arch/arm/mach-ep93xx/edb93xx.c | 4 ++--
> arch/arm/mach-ep93xx/simone.c | 2 +-
> arch/arm/mach-ep93xx/snappercl15.c | 2 +-
> arch/arm/mach-ep93xx/vision_ep9307.c | 4 ++--
> drivers/ata/pata_ep93xx.c | 2 +-
> drivers/dma/ep93xx_dma.c | 2 +-
> drivers/input/keyboard/ep93xx_keypad.c | 2 +-
> drivers/spi/spi-ep93xx.c | 4 ++--
> drivers/video/ep93xx-fb.c | 2 +-
> .../mach/dma.h => include/linux/platform_data/dma-ep93xx.h | 0
> .../linux/platform_data/keypad-ep93xx.h | 0
> .../ep93xx_spi.h => include/linux/platform_data/spi-ep93xx.h | 0
> .../mach/fb.h => include/linux/platform_data/video-ep93xx.h | 0
> sound/soc/ep93xx/ep93xx-ac97.c | 2 +-
> sound/soc/ep93xx/ep93xx-i2s.c | 2 +-
> sound/soc/ep93xx/ep93xx-pcm.c | 2 +-
> 19 files changed, 20 insertions(+), 20 deletions(-)
> rename arch/arm/mach-ep93xx/include/mach/dma.h => include/linux/platform_data/dma-ep93xx.h (100%)
> rename arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h => include/linux/platform_data/keypad-ep93xx.h (100%)
> rename arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h => include/linux/platform_data/spi-ep93xx.h (100%)
> rename arch/arm/mach-ep93xx/include/mach/fb.h => include/linux/platform_data/video-ep93xx.h (100%)
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Arnd,
What about gpio-ep93xx.h? It does not have any platform_data in
it but the gpio driver (driver/gpio/gpio-ep93xx.c) does include it
from the mach-* directory.
Regards,
Hartley
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 13/16] ARM: omap: move platform_data definitions
2012-09-11 16:09 ` Vaibhav Hiremath
@ 2012-09-11 17:04 ` Arnd Bergmann
2012-09-11 17:36 ` Tony Lindgren
0 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 17:04 UTC (permalink / raw)
To: Vaibhav Hiremath
Cc: Shilimkar, Santosh, Dmitry Torokhov, Tony Lindgren,
Artem Bityutskiy, Peter Ujfalusi, Kevin Hilman,
Omar Ramirez Luna, Russell King, Florian Tobias Schandinat,
Tomi Valkeinen, Jean Pihet, Ohad Ben-Cohen, linux-omap,
linux-arm-kernel, Grant Likely, Benoît Cousson,
Greg Kroah-Hartman, Mark Brown, linux-kernel, Liam Girdwood,
Kyungmin Park, J Keerthy, David Woodhouse, Jarkko Nikula
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
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 09/16] ARM: tegra: move platform_data definitions
2012-09-11 15:42 ` Chris Ball
@ 2012-09-11 17:05 ` Arnd Bergmann
2012-09-11 17:11 ` Chris Ball
2012-09-12 16:42 ` Chris Brand
0 siblings, 2 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 17:05 UTC (permalink / raw)
To: Chris Ball
Cc: linux-arm-kernel, linux-kernel, Russell King, Colin Cross,
Olof Johansson, Stephen Warren, Dmitry Torokhov, Liam Girdwood,
Mark Brown, linux-tegra
On Tuesday 11 September 2012, Chris Ball wrote:
> On Tue, Sep 11 2012, Arnd Bergmann wrote:
> > diff --git a/arch/arm/mach-tegra/include/mach/sdhci.h
> > b/include/linux/platform_data/mmc-sdhci-tegra.h
> > similarity index 100%
> > rename from arch/arm/mach-tegra/include/mach/sdhci.h
> > rename to include/linux/platform_data/mmc-sdhci-tegra.h
>
> Looks like you aren't renaming the idempotency guards, so e.g.
> include/linux/platform_data/mmc-sdhci-tegra.h will contain:
>
> #ifndef __ASM_ARM_ARCH_TEGRA_SDHCI_H
> #define __ASM_ARM_ARCH_TEGRA_SDHCI_H
>
> Is that intentional? Thanks,
>
No, it's not intentional. We actually have a lot of instances that
are already wrong. Do we care enough to change the ones I'm moving here?
Arnd
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 09/16] ARM: tegra: move platform_data definitions
2012-09-11 17:05 ` Arnd Bergmann
@ 2012-09-11 17:11 ` Chris Ball
2012-09-12 16:42 ` Chris Brand
1 sibling, 0 replies; 69+ messages in thread
From: Chris Ball @ 2012-09-11 17:11 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Colin Cross,
Olof Johansson, Stephen Warren, Dmitry Torokhov, Liam Girdwood,
Mark Brown, linux-tegra
Hi,
On Tue, Sep 11 2012, Arnd Bergmann wrote:
>> Looks like you aren't renaming the idempotency guards, so e.g.
>> include/linux/platform_data/mmc-sdhci-tegra.h will contain:
>>
>> #ifndef __ASM_ARM_ARCH_TEGRA_SDHCI_H
>> #define __ASM_ARM_ARCH_TEGRA_SDHCI_H
>>
>> Is that intentional? Thanks,
>
> No, it's not intentional. We actually have a lot of instances that
> are already wrong. Do we care enough to change the ones I'm moving here?
It's clearly not a big deal. I did fix it in Stephen's previous version
of this change, though.
Maybe just add a note to the commit message explaining that you aren't
changing the guards and driver maintainers might want to fix them up if
it's something they care about?
Thanks,
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 15/16] ARM: samsung: move platform_data definitions
2012-09-11 13:02 ` [PATCH 15/16] ARM: samsung: " Arnd Bergmann
2012-09-11 13:07 ` Felipe Balbi
@ 2012-09-11 17:12 ` Jeff Garzik
2012-09-12 2:20 ` Kukjin Kim
2012-09-12 5:44 ` Kyungmin Park
3 siblings, 0 replies; 69+ messages in thread
From: Jeff Garzik @ 2012-09-11 17:12 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Kukjin Kim,
Kyungmin Park, Ben Dooks, Mark Brown, Guenter Roeck,
Wolfram Sang (embedded platforms),
Dmitry Torokhov, Bryan Wu, Richard Purdie, Sylwester Nawrocki,
Mauro Carvalho Chehab, Chris Ball, David Woodhouse, Grant Likely,
Felipe Balbi, Greg Kroah-Hartman, Alan Stern, Sangbeom Kim,
Liam Girdwood, linux-samsung-soc
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>
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 03/16] ARM: ep93xx: move platform_data definitions
2012-09-11 16:26 ` H Hartley Sweeten
@ 2012-09-11 17:16 ` Arnd Bergmann
0 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-11 17:16 UTC (permalink / raw)
To: H Hartley Sweeten
Cc: linux-arm-kernel, linux-kernel, Russell King, Grant Likely,
Ryan Mallon, Vinod Koul, Dan Williams, Florian Tobias Schandinat,
Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
Mika Westerberg, Axel Lin
On Tuesday 11 September 2012, H Hartley Sweeten wrote:
> Arnd,
>
> What about gpio-ep93xx.h? It does not have any platform_data in
> it but the gpio driver (driver/gpio/gpio-ep93xx.c) does include it
> from the mach-* directory.
There are actually four such headers for ep93xx:
* mach/ep93xx-regs.h
sound/soc/ep93xx/ep93xx-i2s.c
sound/soc/ep93xx/ep93xx-pcm.c
* mach/gpio-ep93xx.h
drivers/gpio/gpio-ep93xx.c
* mach/hardware.h
drivers/gpio/gpio-ep93xx.c
drivers/input/keyboard/ep93xx_keypad.c
drivers/net/ethernet/cirrus/ep93xx_eth.c
sound/soc/ep93xx/edb93xx.c
sound/soc/ep93xx/ep93xx-i2s.c
sound/soc/ep93xx/ep93xx-pcm.c
sound/soc/ep93xx/simone.c
sound/soc/ep93xx/snappercl15.c
* mach/platform.h
drivers/ata/pata_ep93xx.c
drivers/misc/ep93xx_pwm.c
If you are planning to allow building a combined kernel for ep93xx and
another ARMv4/v5 platform, all of these inclusions need to be removed
and done differently, plus you also need to start using the common clock
subsystem and sparse-irq.
Any of those things would be greatly appreciated as a cleanup, but we're
not going to require them any time soon.
Arnd
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 13/16] ARM: omap: move platform_data definitions
2012-09-11 17:04 ` Arnd Bergmann
@ 2012-09-11 17:36 ` Tony Lindgren
0 siblings, 0 replies; 69+ messages in thread
From: Tony Lindgren @ 2012-09-11 17:36 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Vaibhav Hiremath, Shilimkar, Santosh, Dmitry Torokhov,
Artem Bityutskiy, Peter Ujfalusi, Kevin Hilman,
Omar Ramirez Luna, Russell King, Florian Tobias Schandinat,
Tomi Valkeinen, Jean Pihet, Ohad Ben-Cohen, linux-omap,
linux-arm-kernel, Grant Likely, Benoît Cousson,
Greg Kroah-Hartman, Mark Brown, linux-kernel, Liam Girdwood,
Kyungmin Park, J Keerthy, David Woodhouse, Jarkko Nikula
* 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>
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 12/16] ARM: nomadik: move platform_data definitions
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
` (11 preceding siblings ...)
2012-09-11 13:20 ` [PATCH 01/16] ARM: at91: " Jean-Christophe PLAGNIOL-VILLARD
@ 2012-09-11 18:29 ` Alessandro Rubini
2012-09-14 3:18 ` [PATCH 01/16] ARM: at91: " Vinod Koul
13 siblings, 0 replies; 69+ messages in thread
From: Alessandro Rubini @ 2012-09-11 18:29 UTC (permalink / raw)
To: arnd
Cc: linux-arm-kernel, linux-kernel, linux, linus.walleij,
STEricsson_nomadik_linux, srinidhi.kasagar, herbert, davem,
dmitry.torokhov, dwmw2, balbi, gregkh, andreas.westin
> 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 nomadik include directories
Acked-by: Alessandro Rubini <rubini@unipv.it>
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 10/16] ARM: vt8500: move platform_data definitions
2012-09-11 12:59 ` [PATCH 10/16] ARM: vt8500: " Arnd Bergmann
@ 2012-09-11 20:54 ` Tony Prisk
0 siblings, 0 replies; 69+ messages in thread
From: Tony Prisk @ 2012-09-11 20:54 UTC (permalink / raw)
To: arnd; +Cc: linux-arm-kernel, linux-kernel, linux, FlorianSchandinat
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 2732 bytes --]
On Tue, 2012-09-11 at 14:59 +0200, 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 vt8500 include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Tony Prisk <linux@prisktech.co.nz>
> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
> ---
> arch/arm/mach-vt8500/devices.c | 2 +-
> drivers/video/vt8500lcdfb.c | 2 +-
> drivers/video/wm8505fb.c | 2 +-
> .../vt8500fb.h => include/linux/platform_data/video-vt8500lcdfb.h | 0
> 4 files changed, 3 insertions(+), 3 deletions(-)
> rename arch/arm/mach-vt8500/include/mach/vt8500fb.h => include/linux/platform_data/video-vt8500lcdfb.h (100%)
>
> diff --git a/arch/arm/mach-vt8500/devices.c b/arch/arm/mach-vt8500/devices.c
> index 1fcdc36..82b4bce 100644
> --- a/arch/arm/mach-vt8500/devices.c
> +++ b/arch/arm/mach-vt8500/devices.c
> @@ -23,7 +23,7 @@
>
> #include <asm/mach/arch.h>
>
> -#include <mach/vt8500fb.h>
> +#include <linux/platform_data/video-vt8500lcdfb.h>
> #include <mach/i8042.h>
> #include "devices.h"
>
> diff --git a/drivers/video/vt8500lcdfb.c b/drivers/video/vt8500lcdfb.c
> index 2a5fe6e..66a74f9 100644
> --- a/drivers/video/vt8500lcdfb.c
> +++ b/drivers/video/vt8500lcdfb.c
> @@ -30,7 +30,7 @@
> #include <linux/platform_device.h>
> #include <linux/wait.h>
>
> -#include <mach/vt8500fb.h>
> +#include <linux/platform_data/video-vt8500lcdfb.h>
>
> #include "vt8500lcdfb.h"
> #include "wmt_ge_rops.h"
> diff --git a/drivers/video/wm8505fb.c b/drivers/video/wm8505fb.c
> index c8703bd..ffeff48 100644
> --- a/drivers/video/wm8505fb.c
> +++ b/drivers/video/wm8505fb.c
> @@ -29,7 +29,7 @@
> #include <linux/platform_device.h>
> #include <linux/wait.h>
>
> -#include <mach/vt8500fb.h>
> +#include <linux/platform_data/video-vt8500lcdfb.h>
>
> #include "wm8505fb_regs.h"
> #include "wmt_ge_rops.h"
> diff --git a/arch/arm/mach-vt8500/include/mach/vt8500fb.h b/include/linux/platform_data/video-vt8500lcdfb.h
> similarity index 100%
> rename from arch/arm/mach-vt8500/include/mach/vt8500fb.h
> rename to include/linux/platform_data/video-vt8500lcdfb.h
Acked-by: Tony Prisk <linux@prisktech.co.nz>
Be aware that my current patch series (which has now been finalized)
drops mach-vt8500/devices.c so you might get a conflict depending on the
patch order.
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(階ŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 05/16] ARM: msm: move platform_data definitions
2012-09-11 12:59 ` [PATCH 05/16] ARM: msm: " Arnd Bergmann
@ 2012-09-11 21:07 ` David Brown
0 siblings, 0 replies; 69+ messages in thread
From: David Brown @ 2012-09-11 21:07 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Daniel Walker,
Bryan Huntsman, Chris Ball, Florian Tobias Schandinat,
linux-arm-msm
On Tue, Sep 11, 2012 at 02:59:39PM +0200, 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 msm include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: David Brown <davidb@codeaurora.org>
> Cc: Daniel Walker <dwalker@fifo99.com>
> Cc: Bryan Huntsman <bryanh@codeaurora.org>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
> Cc: linux-arm-msm@vger.kernel.org
> ---
> arch/arm/mach-msm/board-qsd8x50.c | 2 +-
> arch/arm/mach-msm/board-trout-mmc.c | 2 +-
> arch/arm/mach-msm/board-trout-panel.c | 2 +-
> arch/arm/mach-msm/devices-msm7x00.c | 2 +-
> arch/arm/mach-msm/devices-msm7x30.c | 2 +-
> arch/arm/mach-msm/devices-qsd8x50.c | 2 +-
> arch/arm/mach-msm/include/mach/board.h | 2 +-
> drivers/mmc/host/msm_sdcc.c | 2 +-
> drivers/video/msm/mddi.c | 2 +-
> drivers/video/msm/mddi_client_dummy.c | 2 +-
> drivers/video/msm/mddi_client_nt35399.c | 2 +-
> drivers/video/msm/mddi_client_toshiba.c | 2 +-
> drivers/video/msm/mdp.c | 2 +-
> drivers/video/msm/mdp_hw.h | 2 +-
> drivers/video/msm/mdp_ppp.c | 2 +-
> drivers/video/msm/msm_fb.c | 2 +-
> .../include/mach/mmc.h => include/linux/platform_data/mmc-msm_sdcc.h | 0
> .../mach/msm_fb.h => include/linux/platform_data/video-msm_fb.h | 0
> 18 files changed, 16 insertions(+), 16 deletions(-)
> rename arch/arm/mach-msm/include/mach/mmc.h => include/linux/platform_data/mmc-msm_sdcc.h (100%)
> rename arch/arm/mach-msm/include/mach/msm_fb.h => include/linux/platform_data/video-msm_fb.h (100%)
Acked-by: David Brown <davidb@codeaurora.org>
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 03/16] ARM: ep93xx: move platform_data definitions
2012-09-11 12:59 ` [PATCH 03/16] ARM: ep93xx: " Arnd Bergmann
2012-09-11 16:26 ` H Hartley Sweeten
@ 2012-09-11 22:56 ` Ryan Mallon
2012-09-14 3:18 ` Vinod Koul
2 siblings, 0 replies; 69+ messages in thread
From: Ryan Mallon @ 2012-09-11 22:56 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Grant Likely,
Hartley Sweeten, Vinod Koul, Dan Williams,
Florian Tobias Schandinat, Liam Girdwood, Mark Brown,
Jaroslav Kysela, Takashi Iwai, Mika Westerberg, Axel Lin
On 11/09/12 22:59, 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 ep93xx include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Ryan Mallon <rmallon@gmail.com>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Ryan Mallon <rmallon@gmail.com>
> Cc: Jeff Garzik <jgarzik@pobox.com> (supporter:SERIAL ATA
> Cc: Vinod Koul <vinod.koul@intel.com>
> Cc: Dan Williams <djbw@fb.com>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> (maintainer:INPUT
> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
> Cc: Liam Girdwood <lrg@ti.com>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Jaroslav Kysela <perex@perex.cz>
> Cc: Takashi Iwai <tiwai@suse.de>
> Cc: Mika Westerberg <mika.westerberg@iki.fi>
> Cc: Axel Lin <axel.lin@gmail.com>
> ---
> Documentation/spi/ep93xx_spi | 2 +-
> arch/arm/mach-ep93xx/core.c | 6 +++---
> arch/arm/mach-ep93xx/dma.c | 2 +-
> arch/arm/mach-ep93xx/edb93xx.c | 4 ++--
> arch/arm/mach-ep93xx/simone.c | 2 +-
> arch/arm/mach-ep93xx/snappercl15.c | 2 +-
> arch/arm/mach-ep93xx/vision_ep9307.c | 4 ++--
> drivers/ata/pata_ep93xx.c | 2 +-
> drivers/dma/ep93xx_dma.c | 2 +-
> drivers/input/keyboard/ep93xx_keypad.c | 2 +-
> drivers/spi/spi-ep93xx.c | 4 ++--
> drivers/video/ep93xx-fb.c | 2 +-
> .../mach/dma.h => include/linux/platform_data/dma-ep93xx.h | 0
> .../linux/platform_data/keypad-ep93xx.h | 0
> .../ep93xx_spi.h => include/linux/platform_data/spi-ep93xx.h | 0
> .../mach/fb.h => include/linux/platform_data/video-ep93xx.h | 0
> sound/soc/ep93xx/ep93xx-ac97.c | 2 +-
> sound/soc/ep93xx/ep93xx-i2s.c | 2 +-
> sound/soc/ep93xx/ep93xx-pcm.c | 2 +-
> 19 files changed, 20 insertions(+), 20 deletions(-)
> rename arch/arm/mach-ep93xx/include/mach/dma.h => include/linux/platform_data/dma-ep93xx.h (100%)
> rename arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h => include/linux/platform_data/keypad-ep93xx.h (100%)
> rename arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h => include/linux/platform_data/spi-ep93xx.h (100%)
> rename arch/arm/mach-ep93xx/include/mach/fb.h => include/linux/platform_data/video-ep93xx.h (100%)
>
> diff --git a/Documentation/spi/ep93xx_spi b/Documentation/spi/ep93xx_spi
> index d8eb01c..832ddce 100644
> --- a/Documentation/spi/ep93xx_spi
> +++ b/Documentation/spi/ep93xx_spi
> @@ -26,7 +26,7 @@ arch/arm/mach-ep93xx/ts72xx.c:
> #include <linux/gpio.h>
> #include <linux/spi/spi.h>
>
> -#include <mach/ep93xx_spi.h>
> +#include <linux/platform_data/spi-ep93xx.h>
>
> /* this is our GPIO line used for chip select */
> #define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO9
> diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
> index 4afe52a..e85bf17 100644
> --- a/arch/arm/mach-ep93xx/core.c
> +++ b/arch/arm/mach-ep93xx/core.c
> @@ -36,9 +36,9 @@
> #include <linux/export.h>
>
> #include <mach/hardware.h>
> -#include <mach/fb.h>
> -#include <mach/ep93xx_keypad.h>
> -#include <mach/ep93xx_spi.h>
> +#include <linux/platform_data/video-ep93xx.h>
> +#include <linux/platform_data/keypad-ep93xx.h>
> +#include <linux/platform_data/spi-ep93xx.h>
> #include <mach/gpio-ep93xx.h>
>
> #include <asm/mach/map.h>
> diff --git a/arch/arm/mach-ep93xx/dma.c b/arch/arm/mach-ep93xx/dma.c
> index 16976d7..d8bfd02 100644
> --- a/arch/arm/mach-ep93xx/dma.c
> +++ b/arch/arm/mach-ep93xx/dma.c
> @@ -25,7 +25,7 @@
> #include <linux/kernel.h>
> #include <linux/platform_device.h>
>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-ep93xx.h>
> #include <mach/hardware.h>
>
> #include "soc.h"
> diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c
> index 337ab7c..b8f53d5 100644
> --- a/arch/arm/mach-ep93xx/edb93xx.c
> +++ b/arch/arm/mach-ep93xx/edb93xx.c
> @@ -35,8 +35,8 @@
> #include <sound/cs4271.h>
>
> #include <mach/hardware.h>
> -#include <mach/fb.h>
> -#include <mach/ep93xx_spi.h>
> +#include <linux/platform_data/video-ep93xx.h>
> +#include <linux/platform_data/spi-ep93xx.h>
> #include <mach/gpio-ep93xx.h>
>
> #include <asm/hardware/vic.h>
> diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c
> index 33dc079..0eb3f17 100644
> --- a/arch/arm/mach-ep93xx/simone.c
> +++ b/arch/arm/mach-ep93xx/simone.c
> @@ -22,7 +22,7 @@
> #include <linux/i2c-gpio.h>
>
> #include <mach/hardware.h>
> -#include <mach/fb.h>
> +#include <linux/platform_data/video-ep93xx.h>
> #include <mach/gpio-ep93xx.h>
>
> #include <asm/hardware/vic.h>
> diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c
> index 01abd35..50043ee 100644
> --- a/arch/arm/mach-ep93xx/snappercl15.c
> +++ b/arch/arm/mach-ep93xx/snappercl15.c
> @@ -28,7 +28,7 @@
> #include <linux/mtd/nand.h>
>
> #include <mach/hardware.h>
> -#include <mach/fb.h>
> +#include <linux/platform_data/video-ep93xx.h>
> #include <mach/gpio-ep93xx.h>
>
> #include <asm/hardware/vic.h>
> diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c
> index 2905a49..ba92e25 100644
> --- a/arch/arm/mach-ep93xx/vision_ep9307.c
> +++ b/arch/arm/mach-ep93xx/vision_ep9307.c
> @@ -30,8 +30,8 @@
> #include <linux/mmc/host.h>
>
> #include <mach/hardware.h>
> -#include <mach/fb.h>
> -#include <mach/ep93xx_spi.h>
> +#include <linux/platform_data/video-ep93xx.h>
> +#include <linux/platform_data/spi-ep93xx.h>
> #include <mach/gpio-ep93xx.h>
>
> #include <asm/hardware/vic.h>
> diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c
> index 6ef2e37..e056406 100644
> --- a/drivers/ata/pata_ep93xx.c
> +++ b/drivers/ata/pata_ep93xx.c
> @@ -43,7 +43,7 @@
> #include <linux/dmaengine.h>
> #include <linux/ktime.h>
>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-ep93xx.h>
> #include <mach/platform.h>
>
> #define DRV_NAME "ep93xx-ide"
> diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
> index c64917e..4aeaea7 100644
> --- a/drivers/dma/ep93xx_dma.c
> +++ b/drivers/dma/ep93xx_dma.c
> @@ -26,7 +26,7 @@
> #include <linux/platform_device.h>
> #include <linux/slab.h>
>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-ep93xx.h>
>
> #include "dmaengine.h"
>
> diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c
> index c46fc81..7363402 100644
> --- a/drivers/input/keyboard/ep93xx_keypad.c
> +++ b/drivers/input/keyboard/ep93xx_keypad.c
> @@ -29,7 +29,7 @@
> #include <linux/slab.h>
>
> #include <mach/hardware.h>
> -#include <mach/ep93xx_keypad.h>
> +#include <linux/platform_data/keypad-ep93xx.h>
>
> /*
> * Keypad Interface Register offsets
> diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
> index f97f1d2..3a21959 100644
> --- a/drivers/spi/spi-ep93xx.c
> +++ b/drivers/spi/spi-ep93xx.c
> @@ -31,8 +31,8 @@
> #include <linux/scatterlist.h>
> #include <linux/spi/spi.h>
>
> -#include <mach/dma.h>
> -#include <mach/ep93xx_spi.h>
> +#include <linux/platform_data/dma-ep93xx.h>
> +#include <linux/platform_data/spi-ep93xx.h>
>
> #define SSPCR0 0x0000
> #define SSPCR0_MODE_SHIFT 6
> diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
> index 345d962..f2c092da 100644
> --- a/drivers/video/ep93xx-fb.c
> +++ b/drivers/video/ep93xx-fb.c
> @@ -24,7 +24,7 @@
> #include <linux/clk.h>
> #include <linux/fb.h>
>
> -#include <mach/fb.h>
> +#include <linux/platform_data/video-ep93xx.h>
>
> /* Vertical Frame Timing Registers */
> #define EP93XXFB_VLINES_TOTAL 0x0000 /* SW locked */
> diff --git a/arch/arm/mach-ep93xx/include/mach/dma.h b/include/linux/platform_data/dma-ep93xx.h
> similarity index 100%
> rename from arch/arm/mach-ep93xx/include/mach/dma.h
> rename to include/linux/platform_data/dma-ep93xx.h
> diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h b/include/linux/platform_data/keypad-ep93xx.h
> similarity index 100%
> rename from arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
> rename to include/linux/platform_data/keypad-ep93xx.h
> diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h b/include/linux/platform_data/spi-ep93xx.h
> similarity index 100%
> rename from arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h
> rename to include/linux/platform_data/spi-ep93xx.h
> diff --git a/arch/arm/mach-ep93xx/include/mach/fb.h b/include/linux/platform_data/video-ep93xx.h
> similarity index 100%
> rename from arch/arm/mach-ep93xx/include/mach/fb.h
> rename to include/linux/platform_data/video-ep93xx.h
> diff --git a/sound/soc/ep93xx/ep93xx-ac97.c b/sound/soc/ep93xx/ep93xx-ac97.c
> index bdffab3..c352165 100644
> --- a/sound/soc/ep93xx/ep93xx-ac97.c
> +++ b/sound/soc/ep93xx/ep93xx-ac97.c
> @@ -21,7 +21,7 @@
> #include <sound/ac97_codec.h>
> #include <sound/soc.h>
>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-ep93xx.h>
> #include "ep93xx-pcm.h"
>
> /*
> diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c
> index 8df8f6d..ac4a751 100644
> --- a/sound/soc/ep93xx/ep93xx-i2s.c
> +++ b/sound/soc/ep93xx/ep93xx-i2s.c
> @@ -28,7 +28,7 @@
>
> #include <mach/hardware.h>
> #include <mach/ep93xx-regs.h>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-ep93xx.h>
>
> #include "ep93xx-pcm.h"
>
> diff --git a/sound/soc/ep93xx/ep93xx-pcm.c b/sound/soc/ep93xx/ep93xx-pcm.c
> index 4eea98b..665d9c9 100644
> --- a/sound/soc/ep93xx/ep93xx-pcm.c
> +++ b/sound/soc/ep93xx/ep93xx-pcm.c
> @@ -25,7 +25,7 @@
> #include <sound/soc.h>
> #include <sound/dmaengine_pcm.h>
>
> -#include <mach/dma.h>
> +#include <linux/platform_data/dma-ep93xx.h>
> #include <mach/hardware.h>
> #include <mach/ep93xx-regs.h>
>
>
^ permalink raw reply [flat|nested] 69+ messages in thread
* RE: [PATCH 15/16] ARM: samsung: move platform_data definitions
2012-09-11 13:02 ` [PATCH 15/16] ARM: samsung: " Arnd Bergmann
2012-09-11 13:07 ` Felipe Balbi
2012-09-11 17:12 ` Jeff Garzik
@ 2012-09-12 2:20 ` Kukjin Kim
2012-09-12 5:44 ` Kyungmin Park
3 siblings, 0 replies; 69+ messages in thread
From: Kukjin Kim @ 2012-09-12 2:20 UTC (permalink / raw)
To: 'Arnd Bergmann', linux-arm-kernel
Cc: linux-kernel, 'Russell King', 'Kyungmin Park',
'Ben Dooks', 'Mark Brown', 'Jeff Garzik',
'Guenter Roeck',
'Wolfram Sang (embedded platforms)',
'Dmitry Torokhov', 'Bryan Wu',
'Richard Purdie', 'Sylwester Nawrocki',
'Mauro Carvalho Chehab', 'Chris Ball',
'David Woodhouse', 'Grant Likely',
'Felipe Balbi', 'Greg Kroah-Hartman',
'Alan Stern', 'Sangbeom Kim',
'Liam Girdwood',
linux-samsung-soc
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>
Yeah, basically looks OK on this.
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
BTW, how about re-ordering inclusion <linux/platform_data/xxx.h> after
<linux/xxx.h> rather than just replacing like following?
---
#include <linux/xxx.h>
...
#include <linux/platform_data/xxx.h>
...
#include <mach/xxx.h>
...
#include <plat/xxx.h>
...
---
And there are small comments...
> 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%)
I'd prefer asoc-samsung.h and...
> rename arch/arm/plat-samsung/include/plat/audio-simtec.h =>
> include/linux/platform_data/asoc-s3c24xx_simtec.h (100%)
This will be merged into above header.
arch/arm/plat-samsung/include/plat/audio-simtec.h | 34 ----------------
.../linux/platform_data/asoc-samsung.h | 42
++++++++++++++++---
2 files changed, 35 insertions(+), 41 deletions(-)
delete mode 100644 arch/arm/plat-samsung/include/plat/audio-simtec.h
rename arch/arm/plat-samsung/include/plat/audio.h =>
include/linux/platform_data/asoc-samsung.h (63%)
diff --git a/arch/arm/plat-samsung/include/plat/audio-simtec.h
b/arch/arm/plat-samsung/include/plat/audio-simtec.h
deleted file mode 100644
index 376af52..0000000
--- a/arch/arm/plat-samsung/include/plat/audio-simtec.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* arch/arm/plat-samsung/include/plat/audio-simtec.h
- *
- * Copyright 2008 Simtec Electronics
- * http://armlinux.simtec.co.uk/
- * Ben Dooks <ben@simtec.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Simtec Audio support.
-*/
-
-/**
- * struct s3c24xx_audio_simtec_pdata - platform data for simtec audio
- * @use_mpllin: Select codec clock from MPLLin
- * @output_cdclk: Need to output CDCLK to the codec
- * @have_mic: Set if we have a MIC socket
- * @have_lout: Set if we have a LineOut socket
- * @amp_gpio: GPIO pin to enable the AMP
- * @amp_gain: Option GPIO to control AMP gain
- */
-struct s3c24xx_audio_simtec_pdata {
- unsigned int use_mpllin:1;
- unsigned int output_cdclk:1;
-
- unsigned int have_mic:1;
- unsigned int have_lout:1;
-
- int amp_gpio;
- int amp_gain[2];
-
- void (*startup)(void);
-};
diff --git a/arch/arm/plat-samsung/include/plat/audio.h
b/include/linux/platform_data/asoc-samsung.h
similarity index 63%
rename from arch/arm/plat-samsung/include/plat/audio.h
rename to include/linux/platform_data/asoc-samsung.h
index aa9875f..6b1d947 100644
--- a/arch/arm/plat-samsung/include/plat/audio.h
+++ b/include/linux/platform_data/asoc-samsung.h
@@ -1,5 +1,4 @@
-/* arch/arm/plat-samsung/include/plat/audio.h
- *
+/*
* Copyright (c) 2009 Samsung Electronics Co. Ltd
* Author: Jaswinder Singh <jassi.brar@samsung.com>
*
@@ -8,12 +7,13 @@
* published by the Free Software Foundation.
*/
-/* The machine init code calls s3c*_ac97_setup_gpio with
+/*
+ * The machine init code calls s3c*_ac97_setup_gpio with
* one of these defines in order to select appropriate bank
* of GPIO for AC97 pins
*/
-#define S3C64XX_AC97_GPD 0
-#define S3C64XX_AC97_GPE 1
+#define S3C64XX_AC97_GPD 0
+#define S3C64XX_AC97_GPE 1
extern void s3c64xx_ac97_setup_gpio(int);
/*
@@ -21,8 +21,8 @@ extern void s3c64xx_ac97_setup_gpio(int);
* one of these defines in order to select appropriate bank
* of GPIO for S/PDIF pins
*/
-#define S5PC100_SPDIF_GPD 0
-#define S5PC100_SPDIF_GPG3 1
+#define S5PC100_SPDIF_GPD 0
+#define S5PC100_SPDIF_GPG3 1
extern void s5pc100_spdif_setup_gpio(int);
struct samsung_i2s {
@@ -57,3 +57,31 @@ struct s3c_audio_pdata {
struct samsung_i2s i2s;
} type;
};
+
+/**
+ * Simtec Audio support
+
+ * Copyright 2008 Simtec Electronics
+ * http://armlinux.simtec.co.uk/
+ * Ben Dooks <ben@simtec.co.uk>
+ *
+ * struct s3c24xx_audio_simtec_pdata - platform data for simtec audio
+ * @use_mpllin: Select codec clock from MPLLin
+ * @output_cdclk: Need to output CDCLK to the codec
+ * @have_mic: Set if we have a MIC socket
+ * @have_lout: Set if we have a LineOut socket
+ * @amp_gpio: GPIO pin to enable the AMP
+ * @amp_gain: Option GPIO to control AMP gain
+ */
+struct s3c24xx_audio_simtec_pdata {
+ unsigned int use_mpllin:1;
+ unsigned int output_cdclk:1;
+
+ unsigned int have_mic:1;
+ unsigned int have_lout:1;
+
+ int amp_gpio;
+ int amp_gain[2];
+
+ void (*startup)(void);
+};
--
And I think, need to check what header name is better like following?...But
if any policy on the naming, I'm OK :-)
> rename arch/arm/plat-samsung/include/plat/ata.h =>
> include/linux/platform_data/ata-samsung_cf.h (100%)
ata-samsung.h?
> rename arch/arm/plat-samsung/include/plat/hwmon.h =>
> include/linux/platform_data/hwmon-s3c.h (100%)
s3c-hwmon.h?
> 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%)
s3c2410-ts.h?
> rename arch/arm/plat-samsung/include/plat/ehci.h =>
> include/linux/platform_data/usb-ehci-s5p.h (100%)
> rename arch/arm/mach-exynos/include/mach/ohci.h =>
> include/linux/platform_data/usb-exynos.h (100%)
usb-ohci-exynos.h?
> rename arch/arm/plat-samsung/include/plat/usb-control.h =>
> include/linux/platform_data/usb-ohci-s3c2410.h (100%)
> rename arch/arm/plat-samsung/include/plat/udc.h =>
> include/linux/platform_data/usb-s3c2410_udc.h (100%)
>
And just note that conflicts will be happened when merge this into Samsung
tree.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [PATCH 16/16] ARM: spear: move platform_data definitions
2012-09-11 13:02 ` [PATCH 16/16] ARM: spear: " Arnd Bergmann
@ 2012-09-12 3:17 ` viresh kumar
0 siblings, 0 replies; 69+ messages in thread
From: viresh kumar @ 2012-09-12 3:17 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Shiraz Hashim,
spear-devel, Dmitry Torokhov
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>
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 15/16] ARM: samsung: move platform_data definitions
2012-09-11 13:02 ` [PATCH 15/16] ARM: samsung: " Arnd Bergmann
` (2 preceding siblings ...)
2012-09-12 2:20 ` Kukjin Kim
@ 2012-09-12 5:44 ` Kyungmin Park
3 siblings, 0 replies; 69+ messages in thread
From: Kyungmin Park @ 2012-09-12 5:44 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Kukjin Kim,
Ben Dooks, Mark Brown, Jeff Garzik, Guenter Roeck,
Wolfram Sang (embedded platforms),
Dmitry Torokhov, Bryan Wu, Richard Purdie, Sylwester Nawrocki,
Mauro Carvalho Chehab, Chris Ball, David Woodhouse, Grant Likely,
Felipe Balbi, Greg Kroah-Hartman, Alan Stern, Sangbeom Kim,
Liam Girdwood, linux-samsung-soc
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/
>
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 13/16] ARM: omap: move platform_data definitions
2012-09-11 12:59 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
2012-09-11 13:52 ` Peter Ujfalusi
@ 2012-09-12 7:16 ` Pihet-XID, Jean
2012-09-12 17:15 ` Arnd Bergmann
1 sibling, 1 reply; 69+ messages in thread
From: Pihet-XID, Jean @ 2012-09-12 7:16 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Tony Lindgren,
Kevin Hilman, Benoît Cousson, Dmitry Torokhov,
David Woodhouse, Kyungmin Park, Ohad Ben-Cohen, Grant Likely,
Omar Ramirez Luna, Greg Kroah-Hartman, Tomi Valkeinen,
Florian Tobias Schandinat, Peter Ujfalusi, Jarkko Nikula,
Liam Girdwood, Mark Brown, Artem Bityutskiy, J Keerthy,
linux-omap
Hi Arnd,
On Tue, Sep 11, 2012 at 2:59 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>
...
> 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/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
The filename should be voltage-omap.h. The header file is for a
voltage layer which is used by other layers, one of them is the
smartreflex driver code (in drivers/power/avs).
The header file for the smartreflex driver is in
include/linux/power/smartreflex.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
Thanks for the clean-up!
Regards,
Jean
^ permalink raw reply [flat|nested] 69+ messages in thread
* RE: [PATCH 02/16] ARM: davinci: move platform_data definitions
2012-09-11 12:59 ` [PATCH 02/16] ARM: davinci: " Arnd Bergmann
2012-09-11 13:05 ` Felipe Balbi
@ 2012-09-12 10:42 ` Hebbar, Gururaja
2012-09-12 17:11 ` Arnd Bergmann
1 sibling, 1 reply; 69+ messages in thread
From: Hebbar, Gururaja @ 2012-09-12 10:42 UTC (permalink / raw)
To: Arnd Bergmann, Mark Brown
Cc: Hilman, Kevin, davinci-linux-open-source, Chris Ball,
Russell King, Greg Kroah-Hartman, Dmitry Torokhov, linux-kernel,
Balbi, Felipe, Wolfram Sang, Grant Likely, Alan Stern, Ben Dooks,
Mauro Carvalho Chehab, David Woodhouse, Girdwood, Liam,
linux-arm-kernel
On Tue, Sep 11, 2012 at 18:29:36, 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 davinci include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@ti.com>
[..snip..]
[..snip]]
> drivers/usb/musb/da8xx.c | 2 +-
> .../asp.h => include/linux/platform_data/asoc-davinci-evm.h | 0
This will clash with patch "ASoC/ARM: Davinci: McASP: split asp header into
platform and audio specific" queued in ASoC tree by Mark
> .../mach/i2c.h => include/linux/platform_data/i2c-davinci.h | 0
> .../linux/platform_data/keyscan-davinci.h | 0
> .../mach/mmc.h => include/linux/platform_data/mmc-davinci.h | 0
> .../linux/platform_data/mtd-davinci-aemif.h | 0
> .../mach/nand.h => include/linux/platform_data/mtd-davinci.h | 0
> .../mach/spi.h => include/linux/platform_data/spi-davinci.h | 0
> .../mach/usb.h => include/linux/platform_data/usb-davinci.h | 0
> sound/soc/davinci/davinci-evm.c | 2 +-
> sound/soc/davinci/davinci-i2s.c | 2 +-
> sound/soc/davinci/davinci-mcasp.h | 2 +-
> sound/soc/davinci/davinci-pcm.h | 2 +-
> 40 files changed, 68 insertions(+), 68 deletions(-)
> rename arch/arm/mach-davinci/include/mach/asp.h => include/linux/platform_data/asoc-davinci-evm.h (100%)
> rename arch/arm/mach-davinci/include/mach/i2c.h => include/linux/platform_data/i2c-davinci.h (100%)
> rename arch/arm/mach-davinci/include/mach/keyscan.h => include/linux/platform_data/keyscan-davinci.h (100%)
> rename arch/arm/mach-davinci/include/mach/mmc.h => include/linux/platform_data/mmc-davinci.h (100%)
> rename arch/arm/mach-davinci/include/mach/aemif.h => include/linux/platform_data/mtd-davinci-aemif.h (100%)
> rename arch/arm/mach-davinci/include/mach/nand.h => include/linux/platform_data/mtd-davinci.h (100%)
> rename arch/arm/mach-davinci/include/mach/spi.h => include/linux/platform_data/spi-davinci.h (100%)
> rename arch/arm/mach-davinci/include/mach/usb.h => include/linux/platform_data/usb-davinci.h (100%)
>
> diff --git a/arch/arm/mach-davinci/aemif.c b/arch/arm/mach-davinci/aemif.c
> index 1ce70a9..f091a90 100644
> --- a/arch/arm/mach-davinci/aemif.c
> +++ b/arch/arm/mach-davinci/aemif.c
> @@ -15,7 +15,7 @@
> #include <linux/module.h>
> #include <linux/time.h>
>
> -#include <mach/aemif.h>
> +#include <linux/platform_data/mtd-davinci-aemif.h>
>
> /* Timing value configuration */
>
> diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
> index 0031864..95b5e10 100644
> --- a/arch/arm/mach-davinci/board-da830-evm.c
> +++ b/arch/arm/mach-davinci/board-da830-evm.c
> @@ -28,11 +28,11 @@
>
> #include <mach/cp_intc.h>
> #include <mach/mux.h>
> -#include <mach/nand.h>
> +#include <linux/platform_data/mtd-davinci.h>
> #include <mach/da8xx.h>
> -#include <mach/usb.h>
> -#include <mach/aemif.h>
> -#include <mach/spi.h>
> +#include <linux/platform_data/usb-davinci.h>
> +#include <linux/platform_data/mtd-davinci-aemif.h>
> +#include <linux/platform_data/spi-davinci.h>
>
> #define DA830_EVM_PHY_ID ""
> /*
> diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
> index 0149fb4..1295e61 100644
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@ -40,10 +40,10 @@
>
> #include <mach/cp_intc.h>
> #include <mach/da8xx.h>
> -#include <mach/nand.h>
> +#include <linux/platform_data/mtd-davinci.h>
> #include <mach/mux.h>
> -#include <mach/aemif.h>
> -#include <mach/spi.h>
> +#include <linux/platform_data/mtd-davinci-aemif.h>
> +#include <linux/platform_data/spi-davinci.h>
>
> #define DA850_EVM_PHY_ID "davinci_mdio-0:00"
> #define DA850_LCD_PWR_PIN GPIO_TO_PIN(2, 8)
> diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
> index 1c7b1f4..88ebea8 100644
> --- a/arch/arm/mach-davinci/board-dm355-evm.c
> +++ b/arch/arm/mach-davinci/board-dm355-evm.c
> @@ -26,11 +26,11 @@
> #include <asm/mach-types.h>
> #include <asm/mach/arch.h>
>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
> #include <mach/serial.h>
> -#include <mach/nand.h>
> -#include <mach/mmc.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/mtd-davinci.h>
> +#include <linux/platform_data/mmc-davinci.h>
> +#include <linux/platform_data/usb-davinci.h>
>
> #include "davinci.h"
>
> diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
> index 8e77032..2f88103 100644
> --- a/arch/arm/mach-davinci/board-dm355-leopard.c
> +++ b/arch/arm/mach-davinci/board-dm355-leopard.c
> @@ -23,11 +23,11 @@
> #include <asm/mach-types.h>
> #include <asm/mach/arch.h>
>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
> #include <mach/serial.h>
> -#include <mach/nand.h>
> -#include <mach/mmc.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/mtd-davinci.h>
> +#include <linux/platform_data/mmc-davinci.h>
> +#include <linux/platform_data/usb-davinci.h>
>
> #include "davinci.h"
>
> diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
> index 688a9c5..1b4a8ad 100644
> --- a/arch/arm/mach-davinci/board-dm365-evm.c
> +++ b/arch/arm/mach-davinci/board-dm365-evm.c
> @@ -33,11 +33,11 @@
>
> #include <mach/mux.h>
> #include <mach/common.h>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
> #include <mach/serial.h>
> -#include <mach/mmc.h>
> -#include <mach/nand.h>
> -#include <mach/keyscan.h>
> +#include <linux/platform_data/mmc-davinci.h>
> +#include <linux/platform_data/mtd-davinci.h>
> +#include <linux/platform_data/keyscan-davinci.h>
>
> #include <media/tvp514x.h>
>
> diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
> index d34ed55..ca72fc4 100644
> --- a/arch/arm/mach-davinci/board-dm644x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm644x-evm.c
> @@ -31,13 +31,13 @@
> #include <asm/mach/arch.h>
>
> #include <mach/common.h>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
> #include <mach/serial.h>
> #include <mach/mux.h>
> -#include <mach/nand.h>
> -#include <mach/mmc.h>
> -#include <mach/usb.h>
> -#include <mach/aemif.h>
> +#include <linux/platform_data/mtd-davinci.h>
> +#include <linux/platform_data/mmc-davinci.h>
> +#include <linux/platform_data/usb-davinci.h>
> +#include <linux/platform_data/mtd-davinci-aemif.h>
>
> #include "davinci.h"
>
> diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
> index 958679a..9944367 100644
> --- a/arch/arm/mach-davinci/board-dm646x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm646x-evm.c
> @@ -38,11 +38,11 @@
>
> #include <mach/common.h>
> #include <mach/serial.h>
> -#include <mach/i2c.h>
> -#include <mach/nand.h>
> +#include <linux/platform_data/i2c-davinci.h>
> +#include <linux/platform_data/mtd-davinci.h>
> #include <mach/clock.h>
> #include <mach/cdce949.h>
> -#include <mach/aemif.h>
> +#include <linux/platform_data/mtd-davinci-aemif.h>
>
> #include "davinci.h"
> #include "clock.h"
> diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
> index beecde3..43e4a0d 100644
> --- a/arch/arm/mach-davinci/board-mityomapl138.c
> +++ b/arch/arm/mach-davinci/board-mityomapl138.c
> @@ -26,9 +26,9 @@
> #include <mach/common.h>
> #include <mach/cp_intc.h>
> #include <mach/da8xx.h>
> -#include <mach/nand.h>
> +#include <linux/platform_data/mtd-davinci.h>
> #include <mach/mux.h>
> -#include <mach/spi.h>
> +#include <linux/platform_data/spi-davinci.h>
>
> #define MITYOMAPL138_PHY_ID ""
>
> diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
> index f6b9fc7..144bf31 100644
> --- a/arch/arm/mach-davinci/board-neuros-osd2.c
> +++ b/arch/arm/mach-davinci/board-neuros-osd2.c
> @@ -31,12 +31,12 @@
> #include <asm/mach/arch.h>
>
> #include <mach/common.h>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
> #include <mach/serial.h>
> #include <mach/mux.h>
> -#include <mach/nand.h>
> -#include <mach/mmc.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/mtd-davinci.h>
> +#include <linux/platform_data/mmc-davinci.h>
> +#include <linux/platform_data/usb-davinci.h>
>
> #include "davinci.h"
>
> diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
> index 9078acf..6957787 100644
> --- a/arch/arm/mach-davinci/board-sffsdr.c
> +++ b/arch/arm/mach-davinci/board-sffsdr.c
> @@ -36,10 +36,10 @@
> #include <asm/mach/flash.h>
>
> #include <mach/common.h>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
> #include <mach/serial.h>
> #include <mach/mux.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/usb-davinci.h>
>
> #include "davinci.h"
>
> diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h
> index 8db0fc6..43ddf87 100644
> --- a/arch/arm/mach-davinci/davinci.h
> +++ b/arch/arm/mach-davinci/davinci.h
> @@ -23,8 +23,8 @@
> #include <linux/platform_device.h>
> #include <linux/spi/spi.h>
>
> -#include <mach/asp.h>
> -#include <mach/keyscan.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
> +#include <linux/platform_data/keyscan-davinci.h>
> #include <mach/hardware.h>
>
> #include <media/davinci/vpfe_capture.h>
> diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
> index d2f96662..3a42b6f 100644
> --- a/arch/arm/mach-davinci/devices.c
> +++ b/arch/arm/mach-davinci/devices.c
> @@ -15,12 +15,12 @@
> #include <linux/io.h>
>
> #include <mach/hardware.h>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
> #include <mach/irqs.h>
> #include <mach/cputype.h>
> #include <mach/mux.h>
> #include <mach/edma.h>
> -#include <mach/mmc.h>
> +#include <linux/platform_data/mmc-davinci.h>
> #include <mach/time.h>
>
> #include "davinci.h"
> diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
> index 678cd99..612e403 100644
> --- a/arch/arm/mach-davinci/dm355.c
> +++ b/arch/arm/mach-davinci/dm355.c
> @@ -26,8 +26,8 @@
> #include <mach/time.h>
> #include <mach/serial.h>
> #include <mach/common.h>
> -#include <mach/asp.h>
> -#include <mach/spi.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
> +#include <linux/platform_data/spi-davinci.h>
> #include <mach/gpio-davinci.h>
>
> #include "davinci.h"
> diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
> index a50d49de..ee4b0b0 100644
> --- a/arch/arm/mach-davinci/dm365.c
> +++ b/arch/arm/mach-davinci/dm365.c
> @@ -29,9 +29,9 @@
> #include <mach/time.h>
> #include <mach/serial.h>
> #include <mach/common.h>
> -#include <mach/asp.h>
> -#include <mach/keyscan.h>
> -#include <mach/spi.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
> +#include <linux/platform_data/keyscan-davinci.h>
> +#include <linux/platform_data/spi-davinci.h>
> #include <mach/gpio-davinci.h>
>
> #include "davinci.h"
> diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
> index c8b8666..9018a44 100644
> --- a/arch/arm/mach-davinci/dm644x.c
> +++ b/arch/arm/mach-davinci/dm644x.c
> @@ -23,7 +23,7 @@
> #include <mach/time.h>
> #include <mach/serial.h>
> #include <mach/common.h>
> -#include <mach/asp.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
> #include <mach/gpio-davinci.h>
>
> #include "davinci.h"
> diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
> index 9eb87c1..56f8e6e 100644
> --- a/arch/arm/mach-davinci/dm646x.c
> +++ b/arch/arm/mach-davinci/dm646x.c
> @@ -24,7 +24,7 @@
> #include <mach/time.h>
> #include <mach/serial.h>
> #include <mach/common.h>
> -#include <mach/asp.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
> #include <mach/gpio-davinci.h>
>
> #include "davinci.h"
> diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
> index a2f1f27..a273d06 100644
> --- a/arch/arm/mach-davinci/include/mach/da8xx.h
> +++ b/arch/arm/mach-davinci/include/mach/da8xx.h
> @@ -19,12 +19,12 @@
>
> #include <mach/serial.h>
> #include <mach/edma.h>
> -#include <mach/i2c.h>
> -#include <mach/asp.h>
> -#include <mach/mmc.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/i2c-davinci.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
> +#include <linux/platform_data/mmc-davinci.h>
> +#include <linux/platform_data/usb-davinci.h>
> #include <mach/pm.h>
> -#include <mach/spi.h>
> +#include <linux/platform_data/spi-davinci.h>
>
> extern void __iomem *da8xx_syscfg0_base;
> extern void __iomem *da8xx_syscfg1_base;
> diff --git a/arch/arm/mach-davinci/include/mach/tnetv107x.h b/arch/arm/mach-davinci/include/mach/tnetv107x.h
> index 83e5926..1656a02 100644
> --- a/arch/arm/mach-davinci/include/mach/tnetv107x.h
> +++ b/arch/arm/mach-davinci/include/mach/tnetv107x.h
> @@ -36,8 +36,8 @@
> #include <linux/input/matrix_keypad.h>
> #include <linux/mfd/ti_ssp.h>
>
> -#include <mach/mmc.h>
> -#include <mach/nand.h>
> +#include <linux/platform_data/mmc-davinci.h>
> +#include <linux/platform_data/mtd-davinci.h>
> #include <mach/serial.h>
>
> struct tnetv107x_device_info {
> diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
> index 23d2b6d..f77b953 100644
> --- a/arch/arm/mach-davinci/usb.c
> +++ b/arch/arm/mach-davinci/usb.c
> @@ -10,7 +10,7 @@
> #include <mach/common.h>
> #include <mach/irqs.h>
> #include <mach/cputype.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/usb-davinci.h>
>
> #define DAVINCI_USB_OTG_BASE 0x01c64000
>
> diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
> index 79b4bcb..79a2542 100644
> --- a/drivers/i2c/busses/i2c-davinci.c
> +++ b/drivers/i2c/busses/i2c-davinci.c
> @@ -40,7 +40,7 @@
> #include <linux/gpio.h>
>
> #include <mach/hardware.h>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
>
> /* ----- global defines ----------------------------------------------- */
>
> diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c
> index 9d82b3a..d5bacbb 100644
> --- a/drivers/input/keyboard/davinci_keyscan.c
> +++ b/drivers/input/keyboard/davinci_keyscan.c
> @@ -36,7 +36,7 @@
>
> #include <mach/hardware.h>
> #include <mach/irqs.h>
> -#include <mach/keyscan.h>
> +#include <linux/platform_data/keyscan-davinci.h>
>
> /* Key scan registers */
> #define DAVINCI_KEYSCAN_KEYCTRL 0x0000
> diff --git a/drivers/media/video/davinci/vpbe_venc.c b/drivers/media/video/davinci/vpbe_venc.c
> index b21ecc8..0302669 100644
> --- a/drivers/media/video/davinci/vpbe_venc.c
> +++ b/drivers/media/video/davinci/vpbe_venc.c
> @@ -27,7 +27,7 @@
>
> #include <mach/hardware.h>
> #include <mach/mux.h>
> -#include <mach/i2c.h>
> +#include <linux/platform_data/i2c-davinci.h>
>
> #include <linux/io.h>
>
> diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
> index 7cf6c62..3dfd347 100644
> --- a/drivers/mmc/host/davinci_mmc.c
> +++ b/drivers/mmc/host/davinci_mmc.c
> @@ -33,7 +33,7 @@
> #include <linux/dma-mapping.h>
> #include <linux/mmc/mmc.h>
>
> -#include <mach/mmc.h>
> +#include <linux/platform_data/mmc-davinci.h>
> #include <mach/edma.h>
>
> /*
> diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
> index d94b03c..f1deb1e 100644
> --- a/drivers/mtd/nand/davinci_nand.c
> +++ b/drivers/mtd/nand/davinci_nand.c
> @@ -34,8 +34,8 @@
> #include <linux/mtd/partitions.h>
> #include <linux/slab.h>
>
> -#include <mach/nand.h>
> -#include <mach/aemif.h>
> +#include <linux/platform_data/mtd-davinci.h>
> +#include <linux/platform_data/mtd-davinci-aemif.h>
>
> /*
> * This is a device driver for the NAND flash controller found on the
> diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
> index 9b2901f..3afe2f4 100644
> --- a/drivers/spi/spi-davinci.c
> +++ b/drivers/spi/spi-davinci.c
> @@ -30,7 +30,7 @@
> #include <linux/spi/spi_bitbang.h>
> #include <linux/slab.h>
>
> -#include <mach/spi.h>
> +#include <linux/platform_data/spi-davinci.h>
> #include <mach/edma.h>
>
> #define SPI_NO_RESOURCE ((resource_size_t)-1)
> diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
> index 269b1e0..0b815a8 100644
> --- a/drivers/usb/host/ohci-da8xx.c
> +++ b/drivers/usb/host/ohci-da8xx.c
> @@ -17,7 +17,7 @@
> #include <linux/clk.h>
>
> #include <mach/da8xx.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/usb-davinci.h>
>
> #ifndef CONFIG_ARCH_DAVINCI_DA8XX
> #error "This file is DA8xx bus glue. Define CONFIG_ARCH_DAVINCI_DA8XX."
> diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
> index 0f9fcec..15a2627 100644
> --- a/drivers/usb/musb/da8xx.c
> +++ b/drivers/usb/musb/da8xx.c
> @@ -35,7 +35,7 @@
> #include <linux/dma-mapping.h>
>
> #include <mach/da8xx.h>
> -#include <mach/usb.h>
> +#include <linux/platform_data/usb-davinci.h>
>
> #include "musb_core.h"
>
> diff --git a/arch/arm/mach-davinci/include/mach/asp.h b/include/linux/platform_data/asoc-davinci-evm.h
> similarity index 100%
> rename from arch/arm/mach-davinci/include/mach/asp.h
> rename to include/linux/platform_data/asoc-davinci-evm.h
> diff --git a/arch/arm/mach-davinci/include/mach/i2c.h b/include/linux/platform_data/i2c-davinci.h
> similarity index 100%
> rename from arch/arm/mach-davinci/include/mach/i2c.h
> rename to include/linux/platform_data/i2c-davinci.h
> diff --git a/arch/arm/mach-davinci/include/mach/keyscan.h b/include/linux/platform_data/keyscan-davinci.h
> similarity index 100%
> rename from arch/arm/mach-davinci/include/mach/keyscan.h
> rename to include/linux/platform_data/keyscan-davinci.h
> diff --git a/arch/arm/mach-davinci/include/mach/mmc.h b/include/linux/platform_data/mmc-davinci.h
> similarity index 100%
> rename from arch/arm/mach-davinci/include/mach/mmc.h
> rename to include/linux/platform_data/mmc-davinci.h
> diff --git a/arch/arm/mach-davinci/include/mach/aemif.h b/include/linux/platform_data/mtd-davinci-aemif.h
> similarity index 100%
> rename from arch/arm/mach-davinci/include/mach/aemif.h
> rename to include/linux/platform_data/mtd-davinci-aemif.h
> diff --git a/arch/arm/mach-davinci/include/mach/nand.h b/include/linux/platform_data/mtd-davinci.h
> similarity index 100%
> rename from arch/arm/mach-davinci/include/mach/nand.h
> rename to include/linux/platform_data/mtd-davinci.h
> diff --git a/arch/arm/mach-davinci/include/mach/spi.h b/include/linux/platform_data/spi-davinci.h
> similarity index 100%
> rename from arch/arm/mach-davinci/include/mach/spi.h
> rename to include/linux/platform_data/spi-davinci.h
> diff --git a/arch/arm/mach-davinci/include/mach/usb.h b/include/linux/platform_data/usb-davinci.h
> similarity index 100%
> rename from arch/arm/mach-davinci/include/mach/usb.h
> rename to include/linux/platform_data/usb-davinci.h
> diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
> index 10a2d8c..5717bed 100644
> --- a/sound/soc/davinci/davinci-evm.c
> +++ b/sound/soc/davinci/davinci-evm.c
> @@ -22,7 +22,7 @@
> #include <asm/dma.h>
> #include <asm/mach-types.h>
>
> -#include <mach/asp.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
> #include <mach/edma.h>
> #include <mach/mux.h>
>
> diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
> index 0a74b95..6e58828 100644
> --- a/sound/soc/davinci/davinci-i2s.c
> +++ b/sound/soc/davinci/davinci-i2s.c
> @@ -23,7 +23,7 @@
> #include <sound/initval.h>
> #include <sound/soc.h>
>
> -#include <mach/asp.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
>
> #include "davinci-pcm.h"
> #include "davinci-i2s.h"
> diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
> index 4681acc..302aab2 100644
> --- a/sound/soc/davinci/davinci-mcasp.h
> +++ b/sound/soc/davinci/davinci-mcasp.h
> @@ -19,7 +19,7 @@
> #define DAVINCI_MCASP_H
>
> #include <linux/io.h>
> -#include <mach/asp.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
> #include "davinci-pcm.h"
>
> #define DAVINCI_MCASP_RATES SNDRV_PCM_RATE_8000_96000
> diff --git a/sound/soc/davinci/davinci-pcm.h b/sound/soc/davinci/davinci-pcm.h
> index c0d6c9b..36d31cd 100644
> --- a/sound/soc/davinci/davinci-pcm.h
> +++ b/sound/soc/davinci/davinci-pcm.h
> @@ -13,7 +13,7 @@
> #define _DAVINCI_PCM_H
>
> #include <mach/edma.h>
> -#include <mach/asp.h>
> +#include <linux/platform_data/asoc-davinci-evm.h>
>
>
> struct davinci_pcm_dma_params {
> --
> 1.7.10
>
> _______________________________________________
> Davinci-linux-open-source mailing list
> Davinci-linux-open-source@linux.davincidsp.com
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
>
Regards,
Gururaja
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 04/16] ARM: imx: move platform_data definitions
2012-09-11 14:31 ` Guennadi Liakhovetski
@ 2012-09-12 15:52 ` Arnd Bergmann
2012-09-13 7:21 ` Shawn Guo
0 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-12 15:52 UTC (permalink / raw)
To: Guennadi Liakhovetski
Cc: linux-arm-kernel, linux-kernel, Russell King, Sascha Hauer,
Vinod Koul, Dan Williams, Ben Dooks (embedded platforms),
Wolfram Sang (embedded platforms),
Mauro Carvalho Chehab, Chris Ball, David Woodhouse, Grant Likely,
Alan Cox, Greg Kroah-Hartman, Felipe Balbi, Alan Stern,
Florian Tobias Schandinat, Liam Girdwood, Mark Brown,
Javier Martin, Shawn Guo
On Tuesday 11 September 2012, Guennadi Liakhovetski wrote:
> ipu.h is used by the dmaengine and IRQ driver under drivers/dma/ipu/, and
> by its users drivers/media/platform/soc_camera/mx3_camera.c and
> drivers/video/mx3fb.c. It has been placed under arch/arm/... because it's
> arch-specific, but in principle I don't see any reason why it cannot
> happily live anywhere under include/...
Right. We can do that as the next step, after the pure platform data is
out of the way.
Arnd
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 09/16] ARM: tegra: move platform_data definitions
2012-09-11 15:35 ` Stephen Warren
@ 2012-09-12 16:21 ` Arnd Bergmann
2012-09-12 17:29 ` Stephen Warren
0 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-12 16:21 UTC (permalink / raw)
To: Stephen Warren
Cc: linux-arm-kernel, Mark Brown, Russell King, Dmitry Torokhov,
linux-kernel, linux-tegra, Colin Cross, Olof Johansson,
Chris Ball, Liam Girdwood
On Tuesday 11 September 2012, Stephen Warren wrote:
> > .../mach/sdhci.h => include/linux/platform_data/mmc-sdhci-tegra.h | 0
>
> I have a not-yet-applied (but ack'd by Chris Ball) patch to move this to
> include/linux/mmc/tegra_sdhci.h. I believe all the dependencies are
> staged in the Tegra tree now, so I can apply it if you want. I'm fine
> with you apply this patch though; just let me know. If you want to take
> your patch, then this part:
>
> Acked-by: Stephen Warren <swarren@wwwdotorg.org>
I've redone my patch now, the version below is what I have now.
Thanks,
Arnd
>From 1580b8b9c820db3d1e9ffce91fc741516ad5547a Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 12 Sep 2012 18:15:42 +0200
Subject: [PATCH] ARM: tegra: move sdhci platform_data definition
Platform data for device drivers should be defined in
include/linux/platform_data/*.h, not in the architecture
and platform specific directories.
This the definitions for the tegra sdhci driver out of
the tegra include directories, which is the last one
for this platform.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Chris Ball <cjb@laptop.org>
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index e65e837..5f428ff 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@ -26,6 +26,7 @@
#include <linux/io.h>
#include <linux/gpio.h>
#include <linux/i2c.h>
+#include <linux/platform_data/mmc-sdhci-tegra.h>
#include <sound/wm8903.h>
@@ -38,7 +39,6 @@
#include <mach/tegra_wm8903_pdata.h>
#include <mach/iomap.h>
#include <mach/irqs.h>
-#include <mach/sdhci.h>
#include "board.h"
#include "board-harmony.h"
diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c
index 4b64af5..112bf68 100644
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@ -31,6 +31,7 @@
#include <linux/i2c.h>
#include <linux/gpio.h>
#include <linux/rfkill-gpio.h>
+#include <linux/platform_data/mmc-sdhci-tegra.h>
#include <asm/hardware/gic.h>
#include <asm/mach-types.h>
@@ -40,7 +41,6 @@
#include <mach/iomap.h>
#include <mach/irqs.h>
-#include <mach/sdhci.h>
#include "board.h"
#include "board-paz00.h"
diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c
index 776aa95..8d1a66a 100644
--- a/arch/arm/mach-tegra/board-trimslice.c
+++ b/arch/arm/mach-tegra/board-trimslice.c
@@ -27,6 +27,7 @@
#include <linux/i2c.h>
#include <linux/gpio.h>
#include <linux/platform_data/tegra_usb.h>
+#include <linux/platform_data/mmc-sdhci-tegra.h>
#include <asm/hardware/gic.h>
#include <asm/mach-types.h>
@@ -34,7 +35,6 @@
#include <asm/setup.h>
#include <mach/iomap.h>
-#include <mach/sdhci.h>
#include "board.h"
#include "clock.h"
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index 0810ccc..d43e746 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -28,7 +28,7 @@
#include <asm/gpio.h>
#include <mach/gpio-tegra.h>
-#include <mach/sdhci.h>
+#include <linux/platform_data/mmc-sdhci-tegra.h>
#include "sdhci-pltfm.h"
diff --git a/arch/arm/mach-tegra/include/mach/sdhci.h b/include/linux/platform_data/mmc-sdhci-tegra.h
similarity index 84%
rename from arch/arm/mach-tegra/include/mach/sdhci.h
rename to include/linux/platform_data/mmc-sdhci-tegra.h
index 4231bc7..8f84306 100644
--- a/arch/arm/mach-tegra/include/mach/sdhci.h
+++ b/include/linux/platform_data/mmc-sdhci-tegra.h
@@ -1,6 +1,4 @@
/*
- * include/asm-arm/arch-tegra/include/mach/sdhci.h
- *
* Copyright (C) 2009 Palm, Inc.
* Author: Yvonne Yip <y@palm.com>
*
@@ -14,8 +12,8 @@
* GNU General Public License for more details.
*
*/
-#ifndef __ASM_ARM_ARCH_TEGRA_SDHCI_H
-#define __ASM_ARM_ARCH_TEGRA_SDHCI_H
+#ifndef __PLATFORM_DATA_TEGRA_SDHCI_H
+#define __PLATFORM_DATA_TEGRA_SDHCI_H
#include <linux/mmc/host.h>
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [PATCH 12/16] ARM: nomadik: move platform_data definitions
2012-09-11 13:31 ` Linus Walleij
2012-09-11 13:46 ` Arnd Bergmann
@ 2012-09-12 16:24 ` Arnd Bergmann
1 sibling, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-12 16:24 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-arm-kernel, linux-kernel, Russell King, Alessandro Rubini,
STEricsson, Srinidhi Kasagar, Herbert Xu, David S. Miller,
Dmitry Torokhov, David Woodhouse, Felipe Balbi,
Greg Kroah-Hartman, Andreas Westin
On Tuesday 11 September 2012, Linus Walleij wrote:
> I sent a patch for moving gpio-u300.h like this in commit
> 651728507140246e9cf4e809f1877cb2eddbc84e
> that is already in linux-next, is this the same patch or
> another one?
I've dropped that part from my patch now, this is the new version:
Arnd
>From bb95f134f891ff75c5eabf740f93d11ff0ea5eca Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 24 Aug 2012 15:19:33 +0200
Subject: [PATCH 12/16] ARM: nomadik: move platform_data definitions
Platform data for device drivers should be defined in
include/linux/platform_data/*.h, not in the architecture
and platform specific directories.
This moves such data out of the nomadik include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: STEricsson <STEricsson_nomadik_linux@list.st.com>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Andreas Westin <andreas.westin@stericsson.com>
---
arch/arm/mach-nomadik/board-nhk8815.c | 2 +-
arch/arm/mach-u300/core.c | 2 +-
arch/arm/mach-ux500/board-mop500.c | 2 +-
arch/arm/mach-ux500/cpu-db8500.c | 2 +-
arch/arm/mach-ux500/devices-common.h | 2 +-
arch/arm/mach-ux500/usb.c | 2 +-
drivers/crypto/ux500/cryp/cryp_core.c | 2 +-
drivers/crypto/ux500/hash/hash_core.c | 2 +-
drivers/input/keyboard/nomadik-ske-keypad.c | 2 +-
drivers/mtd/nand/nomadik_nand.c | 2 +-
drivers/pinctrl/pinctrl-coh901.c | 2 +-
drivers/usb/musb/ux500_dma.c | 2 +-
.../include/mach => include/linux/platform_data}/crypto-ux500.h | 0
.../plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h | 0
.../mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h | 0
.../mach/usb.h => include/linux/platform_data/usb-musb-ux500.h | 0
17 files changed, 12 insertions(+), 12 deletions(-)
rename {arch/arm/mach-ux500/include/mach => include/linux/platform_data}/crypto-ux500.h (100%)
rename arch/arm/plat-nomadik/include/plat/ske.h => include/linux/platform_data/keypad-nomadik-ske.h (100%)
rename arch/arm/mach-nomadik/include/mach/nand.h => include/linux/platform_data/mtd-nomadik-nand.h (100%)
rename arch/arm/mach-ux500/include/mach/usb.h => include/linux/platform_data/usb-musb-ux500.h (100%)
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c
index f4535a7..381c080 100644
--- a/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@ -34,7 +34,7 @@
#include <plat/gpio-nomadik.h>
#include <plat/mtu.h>
-#include <mach/nand.h>
+#include <linux/platform_data/mtd-nomadik-nand.h>
#include <mach/fsmc.h>
#include "cpu-8815.h"
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 8674a89..38854d4 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -48,7 +48,7 @@
#include <mach/setup.h>
#include <mach/devices.h>
#include <mach/irqs.h>
-#include <mach/crypto-ux500.h>
+#include <linux/platform_data/crypto-ux500.h>
#include "ste-dma40-db8500.h"
#include "devices-db8500.h"
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index db3c52d..1bef4c3 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -24,7 +24,7 @@
#include <mach/hardware.h>
#include <mach/setup.h>
#include <mach/devices.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-musb-ux500.h>
#include <mach/db8500-regs.h>
#include "devices-db8500.h"
diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h
index ecdd838..7fbf0ba 100644
--- a/arch/arm/mach-ux500/devices-common.h
+++ b/arch/arm/mach-ux500/devices-common.h
@@ -13,7 +13,7 @@
#include <linux/sys_soc.h>
#include <linux/amba/bus.h>
#include <linux/platform_data/i2c-nomadik.h>
-#include <mach/crypto-ux500.h>
+#include <linux/platform_data/crypto-ux500.h>
struct spi_master_cntlr;
diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c
index a74af38..145482e 100644
--- a/arch/arm/mach-ux500/usb.c
+++ b/arch/arm/mach-ux500/usb.c
@@ -10,7 +10,7 @@
#include <plat/ste_dma40.h>
#include <mach/hardware.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-musb-ux500.h>
#define MUSB_DMA40_RX_CH { \
.mode = STEDMA40_MODE_LOGICAL, \
diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c
index 1c307e1..ef17e38 100644
--- a/drivers/crypto/ux500/cryp/cryp_core.c
+++ b/drivers/crypto/ux500/cryp/cryp_core.c
@@ -32,7 +32,7 @@
#include <plat/ste_dma40.h>
-#include <mach/crypto-ux500.h>
+#include <linux/platform_data/crypto-ux500.h>
#include <mach/hardware.h>
#include "cryp_p.h"
diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
index 08d5032..0876507 100644
--- a/drivers/crypto/ux500/hash/hash_core.c
+++ b/drivers/crypto/ux500/hash/hash_core.c
@@ -31,7 +31,7 @@
#include <crypto/scatterwalk.h>
#include <crypto/algapi.h>
-#include <mach/crypto-ux500.h>
+#include <linux/platform_data/crypto-ux500.h>
#include <mach/hardware.h>
#include "hash_alg.h"
diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c
index a880e74..49f5fa6 100644
--- a/drivers/input/keyboard/nomadik-ske-keypad.c
+++ b/drivers/input/keyboard/nomadik-ske-keypad.c
@@ -20,7 +20,7 @@
#include <linux/clk.h>
#include <linux/module.h>
-#include <plat/ske.h>
+#include <linux/platform_data/keypad-nomadik-ske.h>
/* SKE_CR bits */
#define SKE_KPMLT (0x1 << 6)
diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c
index a86aa81..9ee0c4e 100644
--- a/drivers/mtd/nand/nomadik_nand.c
+++ b/drivers/mtd/nand/nomadik_nand.c
@@ -31,7 +31,7 @@
#include <linux/mtd/partitions.h>
#include <linux/io.h>
#include <linux/slab.h>
-#include <mach/nand.h>
+#include <linux/platform_data/mtd-nomadik-nand.h>
#include <mach/fsmc.h>
#include <mtd/mtd-abi.h>
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
index d05c7fb..f82246d 100644
--- a/drivers/usb/musb/ux500_dma.c
+++ b/drivers/usb/musb/ux500_dma.c
@@ -30,7 +30,7 @@
#include <linux/dma-mapping.h>
#include <linux/dmaengine.h>
#include <linux/pfn.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-musb-ux500.h>
#include "musb_core.h"
struct ux500_dma_channel {
diff --git a/arch/arm/mach-ux500/include/mach/crypto-ux500.h b/include/linux/platform_data/crypto-ux500.h
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/crypto-ux500.h
rename to include/linux/platform_data/crypto-ux500.h
diff --git a/arch/arm/plat-nomadik/include/plat/ske.h b/include/linux/platform_data/keypad-nomadik-ske.h
similarity index 100%
rename from arch/arm/plat-nomadik/include/plat/ske.h
rename to include/linux/platform_data/keypad-nomadik-ske.h
diff --git a/arch/arm/mach-nomadik/include/mach/nand.h b/include/linux/platform_data/mtd-nomadik-nand.h
similarity index 100%
rename from arch/arm/mach-nomadik/include/mach/nand.h
rename to include/linux/platform_data/mtd-nomadik-nand.h
diff --git a/arch/arm/mach-ux500/include/mach/usb.h b/include/linux/platform_data/usb-musb-ux500.h
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/usb.h
rename to include/linux/platform_data/usb-musb-ux500.h
--
1.7.10
^ permalink raw reply related [flat|nested] 69+ messages in thread
* RE: [PATCH 09/16] ARM: tegra: move platform_data definitions
2012-09-11 17:05 ` Arnd Bergmann
2012-09-11 17:11 ` Chris Ball
@ 2012-09-12 16:42 ` Chris Brand
1 sibling, 0 replies; 69+ messages in thread
From: Chris Brand @ 2012-09-12 16:42 UTC (permalink / raw)
To: Arnd Bergmann, Chris Ball
Cc: Mark Brown, Russell King, Stephen Warren, Dmitry Torokhov,
linux-kernel, linux-tegra, Colin Cross, Olof Johansson,
Liam Girdwood, linux-arm-kernel
You'll want to check that you don't have any cases where two files use the same guard, I'd think.
Chris
-----Original Message-----
From: linux-arm-kernel-bounces@lists.infradead.org [mailto:linux-arm-kernel-bounces@lists.infradead.org] On Behalf Of Arnd Bergmann
Sent: September 11, 2012 10:06 AM
To: Chris Ball
Cc: Mark Brown; Russell King; Stephen Warren; Dmitry Torokhov; linux-kernel@vger.kernel.org; linux-tegra@vger.kernel.org; Colin Cross; Olof Johansson; Liam Girdwood; linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 09/16] ARM: tegra: move platform_data definitions
On Tuesday 11 September 2012, Chris Ball wrote:
> On Tue, Sep 11 2012, Arnd Bergmann wrote:
> > diff --git a/arch/arm/mach-tegra/include/mach/sdhci.h
> > b/include/linux/platform_data/mmc-sdhci-tegra.h
> > similarity index 100%
> > rename from arch/arm/mach-tegra/include/mach/sdhci.h
> > rename to include/linux/platform_data/mmc-sdhci-tegra.h
>
> Looks like you aren't renaming the idempotency guards, so e.g.
> include/linux/platform_data/mmc-sdhci-tegra.h will contain:
>
> #ifndef __ASM_ARM_ARCH_TEGRA_SDHCI_H
> #define __ASM_ARM_ARCH_TEGRA_SDHCI_H
>
> Is that intentional? Thanks,
>
No, it's not intentional. We actually have a lot of instances that
are already wrong. Do we care enough to change the ones I'm moving here?
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 02/16] ARM: davinci: move platform_data definitions
2012-09-12 10:42 ` Hebbar, Gururaja
@ 2012-09-12 17:11 ` Arnd Bergmann
2012-09-13 7:00 ` Hebbar, Gururaja
0 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-12 17:11 UTC (permalink / raw)
To: Hebbar, Gururaja
Cc: Mark Brown, Hilman, Kevin, davinci-linux-open-source, Chris Ball,
Russell King, Greg Kroah-Hartman, Dmitry Torokhov, linux-kernel,
Balbi, Felipe, Wolfram Sang, Grant Likely, Alan Stern, Ben Dooks,
Mauro Carvalho Chehab, David Woodhouse, Girdwood, Liam,
linux-arm-kernel
On Wednesday 12 September 2012, Hebbar, Gururaja wrote:
> On Tue, Sep 11, 2012 at 18:29:36, Arnd Bergmann wrote:
> > drivers/usb/musb/da8xx.c | 2 +-
>
>
> > .../asp.h => include/linux/platform_data/asoc-davinci-evm.h | 0
>
>
> This will clash with patch "ASoC/ARM: Davinci: McASP: split asp header into
> platform and audio specific" queued in ASoC tree by Mark
>
Ok, I've taken out that hunk, this is the remaining patch. There will
still be minor conflicts though, because it changes some adjacent lines.
Arnd
>From d017cbf690ccbaf8561a83a0b3156f0921807939 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 24 Aug 2012 15:11:34 +0200
Subject: [PATCH] ARM: davinci: move platform_data definitions
Platform data for device drivers should be defined in
include/linux/platform_data/*.h, not in the architecture
and platform specific directories.
This moves such data out of the davinci include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: "Ben Dooks" <ben-linux@fluff.org>
Cc: "Wolfram Sang" <w.sang@pengutronix.de>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Chris Ball <cjb@laptop.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Liam Girdwood <lrg@ti.com>
Cc: davinci-linux-open-source@linux.davincidsp.com
diff --git a/arch/arm/mach-davinci/aemif.c b/arch/arm/mach-davinci/aemif.c
index 1ce70a9..f091a90 100644
--- a/arch/arm/mach-davinci/aemif.c
+++ b/arch/arm/mach-davinci/aemif.c
@@ -15,7 +15,7 @@
#include <linux/module.h>
#include <linux/time.h>
-#include <mach/aemif.h>
+#include <linux/platform_data/mtd-davinci-aemif.h>
/* Timing value configuration */
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 0031864..95b5e10 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -28,11 +28,11 @@
#include <mach/cp_intc.h>
#include <mach/mux.h>
-#include <mach/nand.h>
+#include <linux/platform_data/mtd-davinci.h>
#include <mach/da8xx.h>
-#include <mach/usb.h>
-#include <mach/aemif.h>
-#include <mach/spi.h>
+#include <linux/platform_data/usb-davinci.h>
+#include <linux/platform_data/mtd-davinci-aemif.h>
+#include <linux/platform_data/spi-davinci.h>
#define DA830_EVM_PHY_ID ""
/*
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 0149fb4..1295e61 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -40,10 +40,10 @@
#include <mach/cp_intc.h>
#include <mach/da8xx.h>
-#include <mach/nand.h>
+#include <linux/platform_data/mtd-davinci.h>
#include <mach/mux.h>
-#include <mach/aemif.h>
-#include <mach/spi.h>
+#include <linux/platform_data/mtd-davinci-aemif.h>
+#include <linux/platform_data/spi-davinci.h>
#define DA850_EVM_PHY_ID "davinci_mdio-0:00"
#define DA850_LCD_PWR_PIN GPIO_TO_PIN(2, 8)
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index 1c7b1f4..88ebea8 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -26,11 +26,11 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
-#include <mach/nand.h>
-#include <mach/mmc.h>
-#include <mach/usb.h>
+#include <linux/platform_data/mtd-davinci.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/usb-davinci.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index 8e77032..2f88103 100644
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -23,11 +23,11 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
-#include <mach/nand.h>
-#include <mach/mmc.h>
-#include <mach/usb.h>
+#include <linux/platform_data/mtd-davinci.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/usb-davinci.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 688a9c5..1b4a8ad 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -33,11 +33,11 @@
#include <mach/mux.h>
#include <mach/common.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
-#include <mach/mmc.h>
-#include <mach/nand.h>
-#include <mach/keyscan.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/mtd-davinci.h>
+#include <linux/platform_data/keyscan-davinci.h>
#include <media/tvp514x.h>
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index d34ed55..ca72fc4 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -31,13 +31,13 @@
#include <asm/mach/arch.h>
#include <mach/common.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
#include <mach/mux.h>
-#include <mach/nand.h>
-#include <mach/mmc.h>
-#include <mach/usb.h>
-#include <mach/aemif.h>
+#include <linux/platform_data/mtd-davinci.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/usb-davinci.h>
+#include <linux/platform_data/mtd-davinci-aemif.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 958679a..9944367 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -38,11 +38,11 @@
#include <mach/common.h>
#include <mach/serial.h>
-#include <mach/i2c.h>
-#include <mach/nand.h>
+#include <linux/platform_data/i2c-davinci.h>
+#include <linux/platform_data/mtd-davinci.h>
#include <mach/clock.h>
#include <mach/cdce949.h>
-#include <mach/aemif.h>
+#include <linux/platform_data/mtd-davinci-aemif.h>
#include "davinci.h"
#include "clock.h"
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
index beecde3..43e4a0d 100644
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -26,9 +26,9 @@
#include <mach/common.h>
#include <mach/cp_intc.h>
#include <mach/da8xx.h>
-#include <mach/nand.h>
+#include <linux/platform_data/mtd-davinci.h>
#include <mach/mux.h>
-#include <mach/spi.h>
+#include <linux/platform_data/spi-davinci.h>
#define MITYOMAPL138_PHY_ID ""
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index f6b9fc7..144bf31 100644
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -31,12 +31,12 @@
#include <asm/mach/arch.h>
#include <mach/common.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
#include <mach/mux.h>
-#include <mach/nand.h>
-#include <mach/mmc.h>
-#include <mach/usb.h>
+#include <linux/platform_data/mtd-davinci.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/usb-davinci.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index 9078acf..6957787 100644
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -36,10 +36,10 @@
#include <asm/mach/flash.h>
#include <mach/common.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
#include <mach/mux.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-davinci.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h
index 8db0fc6..a37fc44 100644
--- a/arch/arm/mach-davinci/davinci.h
+++ b/arch/arm/mach-davinci/davinci.h
@@ -24,7 +24,7 @@
#include <linux/spi/spi.h>
#include <mach/asp.h>
-#include <mach/keyscan.h>
+#include <linux/platform_data/keyscan-davinci.h>
#include <mach/hardware.h>
#include <media/davinci/vpfe_capture.h>
diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
index d2f96662..3a42b6f 100644
--- a/arch/arm/mach-davinci/devices.c
+++ b/arch/arm/mach-davinci/devices.c
@@ -15,12 +15,12 @@
#include <linux/io.h>
#include <mach/hardware.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <mach/irqs.h>
#include <mach/cputype.h>
#include <mach/mux.h>
#include <mach/edma.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-davinci.h>
#include <mach/time.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 678cd99..adbde33 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -27,7 +27,7 @@
#include <mach/serial.h>
#include <mach/common.h>
#include <mach/asp.h>
-#include <mach/spi.h>
+#include <linux/platform_data/spi-davinci.h>
#include <mach/gpio-davinci.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index a50d49de..719e22f 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -30,8 +30,8 @@
#include <mach/serial.h>
#include <mach/common.h>
#include <mach/asp.h>
-#include <mach/keyscan.h>
-#include <mach/spi.h>
+#include <linux/platform_data/keyscan-davinci.h>
+#include <linux/platform_data/spi-davinci.h>
#include <mach/gpio-davinci.h>
#include "davinci.h"
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index a2f1f27..33e78ae 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -19,12 +19,12 @@
#include <mach/serial.h>
#include <mach/edma.h>
-#include <mach/i2c.h>
#include <mach/asp.h>
-#include <mach/mmc.h>
-#include <mach/usb.h>
#include <mach/pm.h>
-#include <mach/spi.h>
+#include <linux/platform_data/i2c-davinci.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/usb-davinci.h>
+#include <linux/platform_data/spi-davinci.h>
extern void __iomem *da8xx_syscfg0_base;
extern void __iomem *da8xx_syscfg1_base;
diff --git a/arch/arm/mach-davinci/include/mach/tnetv107x.h b/arch/arm/mach-davinci/include/mach/tnetv107x.h
index 83e5926..1656a02 100644
--- a/arch/arm/mach-davinci/include/mach/tnetv107x.h
+++ b/arch/arm/mach-davinci/include/mach/tnetv107x.h
@@ -36,8 +36,8 @@
#include <linux/input/matrix_keypad.h>
#include <linux/mfd/ti_ssp.h>
-#include <mach/mmc.h>
-#include <mach/nand.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/mtd-davinci.h>
#include <mach/serial.h>
struct tnetv107x_device_info {
diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
index 23d2b6d..f77b953 100644
--- a/arch/arm/mach-davinci/usb.c
+++ b/arch/arm/mach-davinci/usb.c
@@ -10,7 +10,7 @@
#include <mach/common.h>
#include <mach/irqs.h>
#include <mach/cputype.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-davinci.h>
#define DAVINCI_USB_OTG_BASE 0x01c64000
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index 79b4bcb..79a2542 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -40,7 +40,7 @@
#include <linux/gpio.h>
#include <mach/hardware.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
/* ----- global defines ----------------------------------------------- */
diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c
index 9d82b3a..d5bacbb 100644
--- a/drivers/input/keyboard/davinci_keyscan.c
+++ b/drivers/input/keyboard/davinci_keyscan.c
@@ -36,7 +36,7 @@
#include <mach/hardware.h>
#include <mach/irqs.h>
-#include <mach/keyscan.h>
+#include <linux/platform_data/keyscan-davinci.h>
/* Key scan registers */
#define DAVINCI_KEYSCAN_KEYCTRL 0x0000
diff --git a/drivers/media/video/davinci/vpbe_venc.c b/drivers/media/video/davinci/vpbe_venc.c
index b21ecc8..0302669 100644
--- a/drivers/media/video/davinci/vpbe_venc.c
+++ b/drivers/media/video/davinci/vpbe_venc.c
@@ -27,7 +27,7 @@
#include <mach/hardware.h>
#include <mach/mux.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-davinci.h>
#include <linux/io.h>
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index 7cf6c62..3dfd347 100644
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -33,7 +33,7 @@
#include <linux/dma-mapping.h>
#include <linux/mmc/mmc.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-davinci.h>
#include <mach/edma.h>
/*
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index d94b03c..f1deb1e 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -34,8 +34,8 @@
#include <linux/mtd/partitions.h>
#include <linux/slab.h>
-#include <mach/nand.h>
-#include <mach/aemif.h>
+#include <linux/platform_data/mtd-davinci.h>
+#include <linux/platform_data/mtd-davinci-aemif.h>
/*
* This is a device driver for the NAND flash controller found on the
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 9b2901f..3afe2f4 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -30,7 +30,7 @@
#include <linux/spi/spi_bitbang.h>
#include <linux/slab.h>
-#include <mach/spi.h>
+#include <linux/platform_data/spi-davinci.h>
#include <mach/edma.h>
#define SPI_NO_RESOURCE ((resource_size_t)-1)
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index 269b1e0..0b815a8 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -17,7 +17,7 @@
#include <linux/clk.h>
#include <mach/da8xx.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-davinci.h>
#ifndef CONFIG_ARCH_DAVINCI_DA8XX
#error "This file is DA8xx bus glue. Define CONFIG_ARCH_DAVINCI_DA8XX."
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
index 0f9fcec..15a2627 100644
--- a/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
@@ -35,7 +35,7 @@
#include <linux/dma-mapping.h>
#include <mach/da8xx.h>
-#include <mach/usb.h>
+#include <linux/platform_data/usb-davinci.h>
#include "musb_core.h"
diff --git a/arch/arm/mach-davinci/include/mach/i2c.h b/include/linux/platform_data/i2c-davinci.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/i2c.h
rename to include/linux/platform_data/i2c-davinci.h
diff --git a/arch/arm/mach-davinci/include/mach/keyscan.h b/include/linux/platform_data/keyscan-davinci.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/keyscan.h
rename to include/linux/platform_data/keyscan-davinci.h
diff --git a/arch/arm/mach-davinci/include/mach/mmc.h b/include/linux/platform_data/mmc-davinci.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/mmc.h
rename to include/linux/platform_data/mmc-davinci.h
diff --git a/arch/arm/mach-davinci/include/mach/aemif.h b/include/linux/platform_data/mtd-davinci-aemif.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/aemif.h
rename to include/linux/platform_data/mtd-davinci-aemif.h
diff --git a/arch/arm/mach-davinci/include/mach/nand.h b/include/linux/platform_data/mtd-davinci.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/nand.h
rename to include/linux/platform_data/mtd-davinci.h
diff --git a/arch/arm/mach-davinci/include/mach/spi.h b/include/linux/platform_data/spi-davinci.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/spi.h
rename to include/linux/platform_data/spi-davinci.h
diff --git a/arch/arm/mach-davinci/include/mach/usb.h b/include/linux/platform_data/usb-davinci.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/usb.h
rename to include/linux/platform_data/usb-davinci.h
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [PATCH 13/16] ARM: omap: move platform_data definitions
2012-09-12 7:16 ` Pihet-XID, Jean
@ 2012-09-12 17:15 ` Arnd Bergmann
2012-09-12 17:40 ` Pihet-XID, Jean
0 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-12 17:15 UTC (permalink / raw)
To: Pihet-XID, Jean
Cc: linux-arm-kernel, linux-kernel, Russell King, Tony Lindgren,
Kevin Hilman, Benoît Cousson, Dmitry Torokhov,
David Woodhouse, Kyungmin Park, Ohad Ben-Cohen, Grant Likely,
Omar Ramirez Luna, Greg Kroah-Hartman, Tomi Valkeinen,
Florian Tobias Schandinat, Peter Ujfalusi, Jarkko Nikula,
Liam Girdwood, Mark Brown, Artem Bityutskiy, J Keerthy,
linux-omap
On Wednesday 12 September 2012, Pihet-XID, Jean wrote:
> > 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
> The filename should be voltage-omap.h. The header file is for a
> voltage layer which is used by other layers, one of them is the
> smartreflex driver code (in drivers/power/avs).
> The header file for the smartreflex driver is in
> include/linux/power/smartreflex.h.
Ok, makes sense. Changed now.
Arnd
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 13/16] ARM: omap: move platform_data definitions
2012-09-11 13:52 ` Peter Ujfalusi
@ 2012-09-12 17:20 ` Arnd Bergmann
2012-09-18 9:57 ` Peter Ujfalusi
0 siblings, 1 reply; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-12 17:20 UTC (permalink / raw)
To: Peter Ujfalusi
Cc: linux-arm-kernel, linux-kernel, Russell King, Tony Lindgren,
Kevin Hilman, Benoît Cousson, Dmitry Torokhov,
David Woodhouse, Kyungmin Park, Ohad Ben-Cohen, Grant Likely,
Omar Ramirez Luna, Greg Kroah-Hartman, Tomi Valkeinen,
Florian Tobias Schandinat, Jarkko Nikula, Liam Girdwood,
Mark Brown, Artem Bityutskiy, Jean Pihet, J Keerthy, linux-omap
On Tuesday 11 September 2012, Peter Ujfalusi wrote:
> OMAP McBSP has nothing to do with a dsp.
> A better name would be: ti-mcbsp.h (or leave it as mcbsp.h)
> McBSP stands for: Multichannel Buffered Serial Port and it is used for audio
> connection (I2S, TDM, etc).
changed to asoc-ti-mcbsp.h to, as discussed.
> > .../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 +-
>
> Let me see these:
>
> This four drivers are going to be removed via sound tree.
> > sound/soc/omap/igep0020.c | 2 +-
> > sound/soc/omap/omap3beagle.c | 2 +-
> > sound/soc/omap/omap3evm.c | 2 +-
> > sound/soc/omap/overo.c | 2 +-
>
> The new driver which replaces these (omap-twl4030.c) does not include
> plat/mcbsp.h
For the sake of bisection, I think we should leave the patch as is.
When merging the two branches, we will get a small conflict that
is trivial to resolve.
> From these ASoC machine drivers you can just remove the <plat/mcbsp.h>
> include since they should not include them (I have pending patch for this to
> be sent):
> > sound/soc/omap/am3517evm.c | 2 +-
> > sound/soc/omap/ams-delta.c | 2 +-
> > sound/soc/omap/n810.c | 2 +-
> > sound/soc/omap/omap3pandora.c | 2 +-
> > sound/soc/omap/osk5912.c | 2 +-
> > sound/soc/omap/rx51.c | 2 +-
> > sound/soc/omap/sdp3430.c | 2 +-
> > sound/soc/omap/zoom2.c | 2 +-
>
> > sound/soc/omap/omap-mcbsp.c | 2 +-
> > sound/soc/omap/mcbsp.c | 2 +-
Can you do that change on top of mine? I would prefer to leave it as is
because I could create this version with a script.
The alternative is that I leave the mcbsp.h file alone entirely and you
submit a patch to fix all instances where it's used, either rename or
remove them.
Arnd
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 09/16] ARM: tegra: move platform_data definitions
2012-09-12 16:21 ` Arnd Bergmann
@ 2012-09-12 17:29 ` Stephen Warren
0 siblings, 0 replies; 69+ messages in thread
From: Stephen Warren @ 2012-09-12 17:29 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, Mark Brown, Russell King, Dmitry Torokhov,
linux-kernel, linux-tegra, Colin Cross, Olof Johansson,
Chris Ball, Liam Girdwood
On 09/12/2012 10:21 AM, Arnd Bergmann wrote:
> On Tuesday 11 September 2012, Stephen Warren wrote:
>
>>> .../mach/sdhci.h => include/linux/platform_data/mmc-sdhci-tegra.h | 0
>>
>> I have a not-yet-applied (but ack'd by Chris Ball) patch to move this to
>> include/linux/mmc/tegra_sdhci.h. I believe all the dependencies are
>> staged in the Tegra tree now, so I can apply it if you want. I'm fine
>> with you apply this patch though; just let me know. If you want to take
>> your patch, then this part:
>>
>> Acked-by: Stephen Warren <swarren@wwwdotorg.org>
>
> I've redone my patch now, the version below is what I have now.
OK, that looks fine.
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 13/16] ARM: omap: move platform_data definitions
2012-09-12 17:15 ` Arnd Bergmann
@ 2012-09-12 17:40 ` Pihet-XID, Jean
0 siblings, 0 replies; 69+ messages in thread
From: Pihet-XID, Jean @ 2012-09-12 17:40 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Tony Lindgren,
Kevin Hilman, Benoît Cousson, Dmitry Torokhov,
David Woodhouse, Kyungmin Park, Ohad Ben-Cohen, Grant Likely,
Omar Ramirez Luna, Greg Kroah-Hartman, Tomi Valkeinen,
Florian Tobias Schandinat, Peter Ujfalusi, Jarkko Nikula,
Liam Girdwood, Mark Brown, Artem Bityutskiy, J Keerthy,
linux-omap
On Wed, Sep 12, 2012 at 7:15 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Wednesday 12 September 2012, Pihet-XID, Jean wrote:
>> > 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
>> The filename should be voltage-omap.h. The header file is for a
>> voltage layer which is used by other layers, one of them is the
>> smartreflex driver code (in drivers/power/avs).
>> The header file for the smartreflex driver is in
>> include/linux/power/smartreflex.h.
>
> Ok, makes sense. Changed now.
Great, thanks!
Jean
>
> Arnd
^ permalink raw reply [flat|nested] 69+ messages in thread
* RE: [PATCH 02/16] ARM: davinci: move platform_data definitions
2012-09-12 17:11 ` Arnd Bergmann
@ 2012-09-13 7:00 ` Hebbar, Gururaja
0 siblings, 0 replies; 69+ messages in thread
From: Hebbar, Gururaja @ 2012-09-13 7:00 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Mark Brown, Hilman, Kevin, davinci-linux-open-source, Chris Ball,
Russell King, Greg Kroah-Hartman, Dmitry Torokhov, linux-kernel,
Balbi, Felipe, Wolfram Sang, Grant Likely, Alan Stern, Ben Dooks,
Mauro Carvalho Chehab, David Woodhouse, Girdwood, Liam,
linux-arm-kernel
On Wed, Sep 12, 2012 at 22:41:09, Arnd Bergmann wrote:
> On Wednesday 12 September 2012, Hebbar, Gururaja wrote:
> > On Tue, Sep 11, 2012 at 18:29:36, Arnd Bergmann wrote:
>
> > > drivers/usb/musb/da8xx.c | 2 +-
> >
> >
> > > .../asp.h => include/linux/platform_data/asoc-davinci-evm.h | 0
> >
> >
> > This will clash with patch "ASoC/ARM: Davinci: McASP: split asp header into
> > platform and audio specific" queued in ASoC tree by Mark
> >
>
> Ok, I've taken out that hunk, this is the remaining patch. There will
> still be minor conflicts though, because it changes some adjacent lines.
>
> Arnd
Thanks for the consideration.
>
>
..snip..
..snip..
Regards,
Gururaja
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 04/16] ARM: imx: move platform_data definitions
2012-09-12 15:52 ` Arnd Bergmann
@ 2012-09-13 7:21 ` Shawn Guo
0 siblings, 0 replies; 69+ messages in thread
From: Shawn Guo @ 2012-09-13 7:21 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Guennadi Liakhovetski, linux-arm-kernel, linux-kernel,
Russell King, Sascha Hauer, Vinod Koul, Dan Williams,
Ben Dooks (embedded platforms), Wolfram Sang (embedded platforms),
Mauro Carvalho Chehab, Chris Ball, David Woodhouse, Grant Likely,
Alan Cox, Greg Kroah-Hartman, Felipe Balbi, Alan Stern,
Florian Tobias Schandinat, Liam Girdwood, Mark Brown,
Javier Martin
On Wed, Sep 12, 2012 at 03:52:25PM +0000, Arnd Bergmann wrote:
> On Tuesday 11 September 2012, Guennadi Liakhovetski wrote:
> > ipu.h is used by the dmaengine and IRQ driver under drivers/dma/ipu/, and
> > by its users drivers/media/platform/soc_camera/mx3_camera.c and
> > drivers/video/mx3fb.c. It has been placed under arch/arm/... because it's
> > arch-specific, but in principle I don't see any reason why it cannot
> > happily live anywhere under include/...
>
> Right. We can do that as the next step, after the pure platform data is
> out of the way.
>
I'm working on a series to clean up the remaining imx mach headers.
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 04/16] ARM: imx: move platform_data definitions
2012-09-11 12:59 ` [PATCH 04/16] ARM: imx: " Arnd Bergmann
2012-09-11 13:40 ` Guennadi Liakhovetski
2012-09-11 13:45 ` Sascha Hauer
@ 2012-09-14 3:17 ` Vinod Koul
2 siblings, 0 replies; 69+ messages in thread
From: Vinod Koul @ 2012-09-14 3:17 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Sascha Hauer,
Dan Williams, Ben Dooks (embedded platforms),
Wolfram Sang (embedded platforms),
Mauro Carvalho Chehab, Chris Ball, David Woodhouse, Grant Likely,
Alan Cox, Greg Kroah-Hartman, Felipe Balbi, Alan Stern,
Florian Tobias Schandinat, Liam Girdwood, Mark Brown,
Javier Martin, Shawn Guo, Guennadi Liakhovetski
On Tue, 2012-09-11 at 14:59 +0200, 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 imx include directories
For these:
> drivers/dma/imx-dma.c | 2 +-
> drivers/dma/imx-sdma.c | 4 +--
Acked-by: Vinod Koul <vinod.koul@linux.intel.com>
--
~Vinod
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 03/16] ARM: ep93xx: move platform_data definitions
2012-09-11 12:59 ` [PATCH 03/16] ARM: ep93xx: " Arnd Bergmann
2012-09-11 16:26 ` H Hartley Sweeten
2012-09-11 22:56 ` Ryan Mallon
@ 2012-09-14 3:18 ` Vinod Koul
2 siblings, 0 replies; 69+ messages in thread
From: Vinod Koul @ 2012-09-14 3:18 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Grant Likely,
Hartley Sweeten, Ryan Mallon, Dan Williams,
Florian Tobias Schandinat, Liam Girdwood, Mark Brown,
Jaroslav Kysela, Takashi Iwai, Mika Westerberg, Axel Lin
On Tue, 2012-09-11 at 14:59 +0200, 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 ep93xx include directories
>
> drivers/dma/ep93xx_dma.c | 2 +-
Acked-by: Vinod Koul <vinod.koul@linux.intel.com>
--
~Vinod
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 01/16] ARM: at91: move platform_data definitions
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
` (12 preceding siblings ...)
2012-09-11 18:29 ` [PATCH 12/16] ARM: nomadik: " Alessandro Rubini
@ 2012-09-14 3:18 ` Vinod Koul
13 siblings, 0 replies; 69+ messages in thread
From: Vinod Koul @ 2012-09-14 3:18 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Nicolas Ferre,
Jean-Christophe Plagniol-Villard, Dan Williams
On Tue, 2012-09-11 at 14:59 +0200, 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 at91 include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
> Cc: Vinod Koul <vinod.koul@intel.com>
> Cc: Dan Williams <djbw@fb.com>
Acked-by: Vinod Koul <vinod.koul@linux.intel.com>
--
~Vinod
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 13/16] ARM: omap: move platform_data definitions
2012-09-12 17:20 ` Arnd Bergmann
@ 2012-09-18 9:57 ` Peter Ujfalusi
2012-09-19 14:49 ` Arnd Bergmann
0 siblings, 1 reply; 69+ messages in thread
From: Peter Ujfalusi @ 2012-09-18 9:57 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, Russell King, Tony Lindgren,
Kevin Hilman, Benoît Cousson, Dmitry Torokhov,
David Woodhouse, Kyungmin Park, Ohad Ben-Cohen, Grant Likely,
Omar Ramirez Luna, Greg Kroah-Hartman, Tomi Valkeinen,
Florian Tobias Schandinat, Jarkko Nikula, Liam Girdwood,
Mark Brown, Artem Bityutskiy, Jean Pihet, J Keerthy, linux-omap
Hi Arnd,
On 09/12/2012 08:20 PM, Arnd Bergmann wrote:
> On Tuesday 11 September 2012, Peter Ujfalusi wrote:
>> OMAP McBSP has nothing to do with a dsp.
>> A better name would be: ti-mcbsp.h (or leave it as mcbsp.h)
>> McBSP stands for: Multichannel Buffered Serial Port and it is used for audio
>> connection (I2S, TDM, etc).
>
> changed to asoc-ti-mcbsp.h to, as discussed.
>
>>> .../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 +-
>>
>> Let me see these:
>>
>> This four drivers are going to be removed via sound tree.
>>> sound/soc/omap/igep0020.c | 2 +-
>>> sound/soc/omap/omap3beagle.c | 2 +-
>>> sound/soc/omap/omap3evm.c | 2 +-
>>> sound/soc/omap/overo.c | 2 +-
>>
>> The new driver which replaces these (omap-twl4030.c) does not include
>> plat/mcbsp.h
>
> For the sake of bisection, I think we should leave the patch as is.
> When merging the two branches, we will get a small conflict that
> is trivial to resolve.
>
>> From these ASoC machine drivers you can just remove the <plat/mcbsp.h>
>> include since they should not include them (I have pending patch for this to
>> be sent):
>>> sound/soc/omap/am3517evm.c | 2 +-
>>> sound/soc/omap/ams-delta.c | 2 +-
>>> sound/soc/omap/n810.c | 2 +-
>>> sound/soc/omap/omap3pandora.c | 2 +-
>>> sound/soc/omap/osk5912.c | 2 +-
>>> sound/soc/omap/rx51.c | 2 +-
>>> sound/soc/omap/sdp3430.c | 2 +-
>>> sound/soc/omap/zoom2.c | 2 +-
>>
>>> sound/soc/omap/omap-mcbsp.c | 2 +-
>>> sound/soc/omap/mcbsp.c | 2 +-
>
> Can you do that change on top of mine? I would prefer to leave it as is
> because I could create this version with a script.
>
> The alternative is that I leave the mcbsp.h file alone entirely and you
> submit a patch to fix all instances where it's used, either rename or
> remove them.
I thought I have replied to this...
Whichever way you prefer. I can craft a series to clean up the plat/mcbsp.h
usage and move the mcbsp header via ASoC tree.
I'm also fine if you do the move.
Let me know what you prefer.
Thanks,
Péter
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 13/16] ARM: omap: move platform_data definitions
2012-09-18 9:57 ` Peter Ujfalusi
@ 2012-09-19 14:49 ` Arnd Bergmann
0 siblings, 0 replies; 69+ messages in thread
From: Arnd Bergmann @ 2012-09-19 14:49 UTC (permalink / raw)
To: Peter Ujfalusi
Cc: linux-arm-kernel, linux-kernel, Russell King, Tony Lindgren,
Kevin Hilman, Benoît Cousson, Dmitry Torokhov,
David Woodhouse, Kyungmin Park, Ohad Ben-Cohen, Grant Likely,
Omar Ramirez Luna, Greg Kroah-Hartman, Tomi Valkeinen,
Florian Tobias Schandinat, Jarkko Nikula, Liam Girdwood,
Mark Brown, Artem Bityutskiy, Jean Pihet, J Keerthy, linux-omap
On Tuesday 18 September 2012, Peter Ujfalusi wrote:
> I thought I have replied to this...
> Whichever way you prefer. I can craft a series to clean up the plat/mcbsp.h
> usage and move the mcbsp header via ASoC tree.
> I'm also fine if you do the move.
> Let me know what you prefer.
>
I think I'll just keep all my patches together then, and leave this one in.
Arnd
^ permalink raw reply [flat|nested] 69+ messages in thread
end of thread, other threads:[~2012-09-19 14:49 UTC | newest]
Thread overview: 69+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1347368245-30989-1-git-send-email-arnd@arndb.de>
2012-09-11 12:59 ` [PATCH 00/16] ARM: big platform data header rename Arnd Bergmann
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
2012-09-11 12:59 ` [PATCH 02/16] ARM: davinci: " Arnd Bergmann
2012-09-11 13:05 ` Felipe Balbi
2012-09-12 10:42 ` Hebbar, Gururaja
2012-09-12 17:11 ` Arnd Bergmann
2012-09-13 7:00 ` Hebbar, Gururaja
2012-09-11 12:59 ` [PATCH 03/16] ARM: ep93xx: " Arnd Bergmann
2012-09-11 16:26 ` H Hartley Sweeten
2012-09-11 17:16 ` Arnd Bergmann
2012-09-11 22:56 ` Ryan Mallon
2012-09-14 3:18 ` Vinod Koul
2012-09-11 12:59 ` [PATCH 04/16] ARM: imx: " Arnd Bergmann
2012-09-11 13:40 ` Guennadi Liakhovetski
2012-09-11 14:10 ` Arnd Bergmann
2012-09-11 14:31 ` Guennadi Liakhovetski
2012-09-12 15:52 ` Arnd Bergmann
2012-09-13 7:21 ` Shawn Guo
2012-09-11 13:45 ` Sascha Hauer
2012-09-14 3:17 ` Vinod Koul
2012-09-11 12:59 ` [PATCH 05/16] ARM: msm: " Arnd Bergmann
2012-09-11 21:07 ` David Brown
2012-09-11 12:59 ` [PATCH 06/16] ARM: netx: " Arnd Bergmann
2012-09-11 13:35 ` Sascha Hauer
2012-09-11 12:59 ` [PATCH 08/16] ARM: sa1100: " Arnd Bergmann
2012-09-11 12:59 ` [PATCH 09/16] ARM: tegra: " Arnd Bergmann
2012-09-11 15:35 ` Stephen Warren
2012-09-12 16:21 ` Arnd Bergmann
2012-09-12 17:29 ` Stephen Warren
2012-09-11 15:42 ` Chris Ball
2012-09-11 17:05 ` Arnd Bergmann
2012-09-11 17:11 ` Chris Ball
2012-09-12 16:42 ` Chris Brand
2012-09-11 12:59 ` [PATCH 10/16] ARM: vt8500: " Arnd Bergmann
2012-09-11 20:54 ` Tony Prisk
2012-09-11 12:59 ` [PATCH 11/16] ARM: w90x900: " Arnd Bergmann
2012-09-11 12:59 ` [PATCH 12/16] ARM: nomadik: " Arnd Bergmann
2012-09-11 13:07 ` Felipe Balbi
2012-09-11 13:31 ` Linus Walleij
2012-09-11 13:46 ` Arnd Bergmann
2012-09-12 16:24 ` Arnd Bergmann
2012-09-11 12:59 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
2012-09-11 13:52 ` Peter Ujfalusi
2012-09-12 17:20 ` Arnd Bergmann
2012-09-18 9:57 ` Peter Ujfalusi
2012-09-19 14:49 ` Arnd Bergmann
2012-09-12 7:16 ` Pihet-XID, Jean
2012-09-12 17:15 ` Arnd Bergmann
2012-09-12 17:40 ` Pihet-XID, Jean
2012-09-11 13:20 ` [PATCH 01/16] ARM: at91: " Jean-Christophe PLAGNIOL-VILLARD
2012-09-11 13:35 ` Nicolas Ferre
2012-09-11 18:29 ` [PATCH 12/16] ARM: nomadik: " Alessandro Rubini
2012-09-14 3:18 ` [PATCH 01/16] ARM: at91: " Vinod Koul
2012-09-11 13:02 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
2012-09-11 13:02 ` [PATCH 14/16] ARM: orion: " Arnd Bergmann
2012-09-11 13:11 ` Thomas Petazzoni
2012-09-11 13:02 ` [PATCH 15/16] ARM: samsung: " Arnd Bergmann
2012-09-11 13:07 ` Felipe Balbi
2012-09-11 17:12 ` Jeff Garzik
2012-09-12 2:20 ` Kukjin Kim
2012-09-12 5:44 ` Kyungmin Park
2012-09-11 13:02 ` [PATCH 16/16] ARM: spear: " Arnd Bergmann
2012-09-12 3:17 ` viresh kumar
2012-09-11 14:06 ` [PATCH 13/16] ARM: omap: " Shilimkar, Santosh
2012-09-11 14:17 ` Arnd Bergmann
2012-09-11 14:24 ` Shilimkar, Santosh
2012-09-11 16:09 ` Vaibhav Hiremath
2012-09-11 17:04 ` Arnd Bergmann
2012-09-11 17:36 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).