Skip to contentSkip to conversation

ARM: big platform data header rename

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

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

A message that is not in the archive (sent off-list or not yet received): [email protected]

Arnd Bergmann

author
#1 lore raw

cover ARM: big platform data header rename

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 at vger.kernel.org
Cc: openezx-devel at lists.openezx.org
Cc: spear-devel at list.st.com
Cc: davinci-linux-open-source at linux.davincidsp.com
Cc: linux-arm-msm at vger.kernel.org
Cc: linux-omap at vger.kernel.org
Cc: linux-samsung-soc at vger.kernel.org
Cc: linux-tegra at vger.kernel.org
Bcc: "Ben Dooks" <[email protected]>
Bcc: "Beno?t Cousson" <[email protected]>
Bcc: "David S. Miller" <[email protected]>
Bcc: "Wolfram Sang" <[email protected]>
Bcc: Alan Cox <[email protected]>
Bcc: Alan Stern <[email protected]>
Bcc: Alessandro Rubini <[email protected]>
Bcc: Andreas Westin <[email protected]>
Bcc: Andrew Lunn <[email protected]>
Bcc: Artem Bityutskiy <[email protected]>
Bcc: Axel Lin <[email protected]>
Bcc: Ben Dooks <[email protected]>
Bcc: Bryan Huntsman <[email protected]>
Bcc: Bryan Wu <[email protected]>
Bcc: Chris Ball <[email protected]>
Bcc: Colin Cross <[email protected]>
Bcc: Dan Williams <[email protected]>
Bcc: Daniel Ribeiro <[email protected]>
Bcc: Daniel Walker <[email protected]>
Bcc: David Brown <[email protected]>
Bcc: David Woodhouse <[email protected]>
Bcc: Dmitry Torokhov <[email protected]>
Bcc: Eric Miao <[email protected]>
Bcc: Felipe Balbi <[email protected]>
Bcc: Florian Tobias Schandinat <[email protected]>
Bcc: Grant Likely <[email protected]>
Bcc: Greg Kroah-Hartman <[email protected]>
Bcc: Guennadi Liakhovetski <[email protected]>
Bcc: Guenter Roeck <[email protected]>
Bcc: Haojian Zhuang <[email protected]>
Bcc: Harald Welte <[email protected]>
Bcc: Hartley Sweeten <[email protected]>
Bcc: Herbert Xu <[email protected]>
Bcc: J Keerthy <[email protected]>
Bcc: Jarkko Nikula <[email protected]>
Bcc: Jaroslav Kysela <[email protected]>
Bcc: Jason Cooper <[email protected]>
Bcc: Javier Martin <[email protected]>
Bcc: Jean Pihet <[email protected]>
Bcc: Jean-Christophe Plagniol-Villard <[email protected]>
Bcc: Jeff Garzik <[email protected]>
Bcc: Jochen Friedrich <[email protected]>
Bcc: Jonathan Cameron <[email protected]>
Bcc: Kevin Hilman <[email protected]>
Bcc: Kukjin Kim <[email protected]>
Bcc: Kyungmin Park <[email protected]>
Bcc: Liam Girdwood <[email protected]>
Bcc: Linus Walleij <[email protected]>
Bcc: Marek Vasut <[email protected]>
Bcc: Mark Brown <[email protected]>
Bcc: Mauro Carvalho Chehab <[email protected]>
Bcc: Mika Westerberg <[email protected]>
Bcc: Nicolas Ferre <[email protected]>
Bcc: Nicolas Pitre <[email protected]>
Bcc: Ohad Ben-Cohen <[email protected]>
Bcc: Olof Johansson <[email protected]>
Bcc: Omar Ramirez Luna <[email protected]>
Bcc: Paul Parsons <[email protected]>
Bcc: Peter Ujfalusi <[email protected]>
Bcc: Philipp Zabel <[email protected]>
Bcc: Richard Purdie <[email protected]>
Bcc: Robert Jarzmik <[email protected]>
Bcc: Russell King <[email protected]>
Bcc: Ryan Mallon <[email protected]>
Bcc: STEricsson <[email protected]>
Bcc: Samuel Ortiz <[email protected]>
Bcc: Sangbeom Kim <[email protected]>
Bcc: Sascha Hauer <[email protected]>
Bcc: Sekhar Nori <[email protected]>
Bcc: Sergey Lapin <[email protected]>
Bcc: Shawn Guo <[email protected]>
Bcc: Shiraz Hashim <[email protected]>
Bcc: Srinidhi Kasagar <[email protected]>
Bcc: Stefan Schmidt <[email protected]>
Bcc: Stephen Warren <[email protected]>
Bcc: Sylwester Nawrocki <[email protected]>
Bcc: Takashi Iwai <[email protected]>
Bcc: Tomas Cech <[email protected]>
Bcc: Tomi Valkeinen <[email protected]>
Bcc: Tony Lindgren <[email protected]>
Bcc: Tony Prisk <[email protected]>
Bcc: Vinod Koul <[email protected]>
Bcc: Viresh Kumar <[email protected]>
Bcc: Wan ZongShun <[email protected]>

author
#2 lore raw

PATCH 1/16 ARM: at91: 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 at91 include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc Jean-Christophe Plagniol-Villard <[email protected]>
Cc Vinod Koul <[email protected]>
Cc Dan Williams <[email protected]>
---
 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%)
arch/arm/mach-at91/at91sam9g45_devices.c +1 -1
index 0607399..0aa9bdb 100644
@@ -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>
arch/arm/mach-at91/at91sam9rl_devices.c +1 -1
index f09fff9..e4da717 100644
@@ -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"
arch/arm/mach-at91/include/mach/atmel-mci.h +1 -1
index 998cb0c..cd580a1 100644
@@ -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
drivers/dma/at_hdmac_regs.h +1 -1
index 8a6c8e8..116e4ad 100644
@@ -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
include/linux/platform_data/atmel-aes.h +1 -1
index e7a1949..ab68082 100644
@@ -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
include/linux/platform_data/dma-atmel.h renamed from arch/arm/mach-at91/include/mach/at_hdmac.h +0 -0
similarity index 100%
rename from arch/arm/mach-at91/include/mach/at_hdmac.h
rename to include/linux/platform_data/dma-atmel.h
Signature · 1 line
1.7.10
author
#3 lore raw

PATCH 2/16 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 <[email protected]>
Cc Sekhar Nori <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc "Ben Dooks" <[email protected]>
Cc "Wolfram Sang" <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Chris Ball <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Grant Likely <[email protected]>
Cc Alan Stern <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc davinci-linux-open-source at 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%)
arch/arm/mach-davinci/aemif.c +1 -1
index 1ce70a9..f091a90 100644
@@ -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 */
arch/arm/mach-davinci/board-da830-evm.c +4 -4
index 0031864..95b5e10 100644
@@ -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		""
 /*
arch/arm/mach-davinci/board-da850-evm.c +3 -3
index 0149fb4..1295e61 100644
@@ -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)
arch/arm/mach-davinci/board-dm355-evm.c +4 -4
index 1c7b1f4..88ebea8 100644
@@ -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"
arch/arm/mach-davinci/board-dm355-leopard.c +4 -4
index 8e77032..2f88103 100644
@@ -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"
arch/arm/mach-davinci/board-dm365-evm.c +4 -4
index 688a9c5..1b4a8ad 100644
@@ -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>
arch/arm/mach-davinci/board-dm644x-evm.c +5 -5
index d34ed55..ca72fc4 100644
@@ -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"
arch/arm/mach-davinci/board-dm646x-evm.c +3 -3
index 958679a..9944367 100644
@@ -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"
arch/arm/mach-davinci/board-mityomapl138.c +2 -2
index beecde3..43e4a0d 100644
@@ -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		""
arch/arm/mach-davinci/board-neuros-osd2.c +4 -4
index f6b9fc7..144bf31 100644
@@ -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"
arch/arm/mach-davinci/board-sffsdr.c +2 -2
index 9078acf..6957787 100644
@@ -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"
arch/arm/mach-davinci/davinci.h +2 -2
index 8db0fc6..43ddf87 100644
@@ -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>
arch/arm/mach-davinci/devices.c +2 -2
index d2f96662..3a42b6f 100644
@@ -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"
arch/arm/mach-davinci/dm355.c +2 -2
index 678cd99..612e403 100644
@@ -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"
arch/arm/mach-davinci/dm365.c +3 -3
index a50d49de..ee4b0b0 100644
@@ -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"
arch/arm/mach-davinci/dm644x.c +1 -1
index c8b8666..9018a44 100644
@@ -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"
arch/arm/mach-davinci/dm646x.c +1 -1
index 9eb87c1..56f8e6e 100644
@@ -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"
arch/arm/mach-davinci/include/mach/da8xx.h +5 -5
index a2f1f27..a273d06 100644
@@ -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;
arch/arm/mach-davinci/include/mach/tnetv107x.h +2 -2
index 83e5926..1656a02 100644
@@ -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 {
arch/arm/mach-davinci/usb.c +1 -1
index 23d2b6d..f77b953 100644
@@ -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
drivers/i2c/busses/i2c-davinci.c +1 -1
index 79b4bcb..79a2542 100644
@@ -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 ----------------------------------------------- */
drivers/input/keyboard/davinci_keyscan.c +1 -1
index 9d82b3a..d5bacbb 100644
@@ -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
drivers/media/video/davinci/vpbe_venc.c +1 -1
index b21ecc8..0302669 100644
@@ -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>
drivers/mmc/host/davinci_mmc.c +1 -1
index 7cf6c62..3dfd347 100644
@@ -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>
 
 /*
drivers/mtd/nand/davinci_nand.c +2 -2
index d94b03c..f1deb1e 100644
@@ -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
drivers/spi/spi-davinci.c +1 -1
index 9b2901f..3afe2f4 100644
@@ -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)
drivers/usb/host/ohci-da8xx.c +1 -1
index 269b1e0..0b815a8 100644
@@ -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."
drivers/usb/musb/da8xx.c +1 -1
index 0f9fcec..15a2627 100644
@@ -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"
include/linux/platform_data/asoc-davinci-evm.h renamed from arch/arm/mach-davinci/include/mach/asp.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/asp.h
rename to include/linux/platform_data/asoc-davinci-evm.h
include/linux/platform_data/i2c-davinci.h renamed from arch/arm/mach-davinci/include/mach/i2c.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/i2c.h
rename to include/linux/platform_data/i2c-davinci.h
include/linux/platform_data/keyscan-davinci.h renamed from arch/arm/mach-davinci/include/mach/keyscan.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/keyscan.h
rename to include/linux/platform_data/keyscan-davinci.h
include/linux/platform_data/mmc-davinci.h renamed from arch/arm/mach-davinci/include/mach/mmc.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/mmc.h
rename to include/linux/platform_data/mmc-davinci.h
include/linux/platform_data/mtd-davinci-aemif.h renamed from arch/arm/mach-davinci/include/mach/aemif.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/aemif.h
rename to include/linux/platform_data/mtd-davinci-aemif.h
include/linux/platform_data/mtd-davinci.h renamed from arch/arm/mach-davinci/include/mach/nand.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/nand.h
rename to include/linux/platform_data/mtd-davinci.h
include/linux/platform_data/spi-davinci.h renamed from arch/arm/mach-davinci/include/mach/spi.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/spi.h
rename to include/linux/platform_data/spi-davinci.h
include/linux/platform_data/usb-davinci.h renamed from arch/arm/mach-davinci/include/mach/usb.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/usb.h
rename to include/linux/platform_data/usb-davinci.h
sound/soc/davinci/davinci-evm.c +1 -1
index 10a2d8c..5717bed 100644
@@ -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>
sound/soc/davinci/davinci-i2s.c +1 -1
index 0a74b95..6e58828 100644
@@ -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"
sound/soc/davinci/davinci-mcasp.h +1 -1
index 4681acc..302aab2 100644
@@ -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
sound/soc/davinci/davinci-pcm.h +1 -1
index c0d6c9b..36d31cd 100644
@@ -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 {
Signature · 1 line
1.7.10
Acked-by on v1 2/16
#4 lore raw

Re: [PATCH 02/16] ARM: davinci: move platform_data definitions

Quoted 6 lines · Arnd Bergmann

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

This moves such data out of the davinci include directories

Quoted 16 lines
Signed-off-by Arnd Bergmann <[email protected]>
Cc Sekhar Nori <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc "Ben Dooks" <[email protected]>
Cc "Wolfram Sang" <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Chris Ball <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Grant Likely <[email protected]>
Cc Alan Stern <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc davinci-linux-open-source at linux.davincidsp.com

for musb:

Acked-by Felipe Balbi <[email protected]>
Quoted 593 lines
---
 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%)
arch/arm/mach-davinci/aemif.c +1 -1
index 1ce70a9..f091a90 100644
@@ -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 */
arch/arm/mach-davinci/board-da830-evm.c +4 -4
index 0031864..95b5e10 100644
@@ -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		""
 /*
arch/arm/mach-davinci/board-da850-evm.c +3 -3
index 0149fb4..1295e61 100644
@@ -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)
arch/arm/mach-davinci/board-dm355-evm.c +4 -4
index 1c7b1f4..88ebea8 100644
@@ -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"
arch/arm/mach-davinci/board-dm355-leopard.c +4 -4
index 8e77032..2f88103 100644
@@ -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"
arch/arm/mach-davinci/board-dm365-evm.c +4 -4
index 688a9c5..1b4a8ad 100644
@@ -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>
arch/arm/mach-davinci/board-dm644x-evm.c +5 -5
index d34ed55..ca72fc4 100644
@@ -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"
arch/arm/mach-davinci/board-dm646x-evm.c +3 -3
index 958679a..9944367 100644
@@ -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"
arch/arm/mach-davinci/board-mityomapl138.c +2 -2
index beecde3..43e4a0d 100644
@@ -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		""
arch/arm/mach-davinci/board-neuros-osd2.c +4 -4
index f6b9fc7..144bf31 100644
@@ -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"
arch/arm/mach-davinci/board-sffsdr.c +2 -2
index 9078acf..6957787 100644
@@ -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"
arch/arm/mach-davinci/davinci.h +2 -2
index 8db0fc6..43ddf87 100644
@@ -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>
arch/arm/mach-davinci/devices.c +2 -2
index d2f96662..3a42b6f 100644
@@ -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"
arch/arm/mach-davinci/dm355.c +2 -2
index 678cd99..612e403 100644
@@ -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"
arch/arm/mach-davinci/dm365.c +3 -3
index a50d49de..ee4b0b0 100644
@@ -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"
arch/arm/mach-davinci/dm644x.c +1 -1
index c8b8666..9018a44 100644
@@ -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"
arch/arm/mach-davinci/dm646x.c +1 -1
index 9eb87c1..56f8e6e 100644
@@ -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"
arch/arm/mach-davinci/include/mach/da8xx.h +5 -5
index a2f1f27..a273d06 100644
@@ -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;
arch/arm/mach-davinci/include/mach/tnetv107x.h +2 -2
index 83e5926..1656a02 100644
@@ -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 {
arch/arm/mach-davinci/usb.c +1 -1
index 23d2b6d..f77b953 100644
@@ -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
drivers/i2c/busses/i2c-davinci.c +1 -1
index 79b4bcb..79a2542 100644
@@ -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 ----------------------------------------------- */
drivers/input/keyboard/davinci_keyscan.c +1 -1
index 9d82b3a..d5bacbb 100644
@@ -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
drivers/media/video/davinci/vpbe_venc.c +1 -1
index b21ecc8..0302669 100644
@@ -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>
drivers/mmc/host/davinci_mmc.c +1 -1
index 7cf6c62..3dfd347 100644
@@ -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>
 
 /*
drivers/mtd/nand/davinci_nand.c +2 -2
index d94b03c..f1deb1e 100644
@@ -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
drivers/spi/spi-davinci.c +1 -1
index 9b2901f..3afe2f4 100644
@@ -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)
drivers/usb/host/ohci-da8xx.c +1 -1
index 269b1e0..0b815a8 100644
@@ -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."
drivers/usb/musb/da8xx.c +1 -1
index 0f9fcec..15a2627 100644
@@ -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"
include/linux/platform_data/asoc-davinci-evm.h renamed from arch/arm/mach-davinci/include/mach/asp.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/asp.h
rename to include/linux/platform_data/asoc-davinci-evm.h
include/linux/platform_data/i2c-davinci.h renamed from arch/arm/mach-davinci/include/mach/i2c.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/i2c.h
rename to include/linux/platform_data/i2c-davinci.h
include/linux/platform_data/keyscan-davinci.h renamed from arch/arm/mach-davinci/include/mach/keyscan.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/keyscan.h
rename to include/linux/platform_data/keyscan-davinci.h
include/linux/platform_data/mmc-davinci.h renamed from arch/arm/mach-davinci/include/mach/mmc.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/mmc.h
rename to include/linux/platform_data/mmc-davinci.h
include/linux/platform_data/mtd-davinci-aemif.h renamed from arch/arm/mach-davinci/include/mach/aemif.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/aemif.h
rename to include/linux/platform_data/mtd-davinci-aemif.h
include/linux/platform_data/mtd-davinci.h renamed from arch/arm/mach-davinci/include/mach/nand.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/nand.h
rename to include/linux/platform_data/mtd-davinci.h
include/linux/platform_data/spi-davinci.h renamed from arch/arm/mach-davinci/include/mach/spi.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/spi.h
rename to include/linux/platform_data/spi-davinci.h
include/linux/platform_data/usb-davinci.h renamed from arch/arm/mach-davinci/include/mach/usb.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/usb.h
rename to include/linux/platform_data/usb-davinci.h
sound/soc/davinci/davinci-evm.c +1 -1
index 10a2d8c..5717bed 100644
@@ -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>
sound/soc/davinci/davinci-i2s.c +1 -1
index 0a74b95..6e58828 100644
@@ -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"
sound/soc/davinci/davinci-mcasp.h +1 -1
index 4681acc..302aab2 100644
@@ -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
sound/soc/davinci/davinci-pcm.h +1 -1
index c0d6c9b..36d31cd 100644
@@ -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 {
Signature · 1 line
1.7.10
Signature · 8 lines
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120911/2b4614e0/attachment-0001.sig>
#5 lore raw

RE: [PATCH 02/16] ARM: davinci: move platform_data definitions

In reply to Arnd Bergmann
Quoted 9 lines · Arnd Bergmann

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

This moves such data out of the davinci include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Sekhar Nori <[email protected]>
Cc Kevin Hilman <[email protected]>

[..snip..]
[..snip]]

Quoted 4 lines
 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

Quoted 568 lines
 .../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%)
arch/arm/mach-davinci/aemif.c +1 -1
index 1ce70a9..f091a90 100644
@@ -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 */
arch/arm/mach-davinci/board-da830-evm.c +4 -4
index 0031864..95b5e10 100644
@@ -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		""
 /*
arch/arm/mach-davinci/board-da850-evm.c +3 -3
index 0149fb4..1295e61 100644
@@ -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)
arch/arm/mach-davinci/board-dm355-evm.c +4 -4
index 1c7b1f4..88ebea8 100644
@@ -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"
arch/arm/mach-davinci/board-dm355-leopard.c +4 -4
index 8e77032..2f88103 100644
@@ -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"
arch/arm/mach-davinci/board-dm365-evm.c +4 -4
index 688a9c5..1b4a8ad 100644
@@ -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>
arch/arm/mach-davinci/board-dm644x-evm.c +5 -5
index d34ed55..ca72fc4 100644
@@ -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"
arch/arm/mach-davinci/board-dm646x-evm.c +3 -3
index 958679a..9944367 100644
@@ -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"
arch/arm/mach-davinci/board-mityomapl138.c +2 -2
index beecde3..43e4a0d 100644
@@ -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		""
arch/arm/mach-davinci/board-neuros-osd2.c +4 -4
index f6b9fc7..144bf31 100644
@@ -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"
arch/arm/mach-davinci/board-sffsdr.c +2 -2
index 9078acf..6957787 100644
@@ -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"
arch/arm/mach-davinci/davinci.h +2 -2
index 8db0fc6..43ddf87 100644
@@ -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>
arch/arm/mach-davinci/devices.c +2 -2
index d2f96662..3a42b6f 100644
@@ -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"
arch/arm/mach-davinci/dm355.c +2 -2
index 678cd99..612e403 100644
@@ -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"
arch/arm/mach-davinci/dm365.c +3 -3
index a50d49de..ee4b0b0 100644
@@ -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"
arch/arm/mach-davinci/dm644x.c +1 -1
index c8b8666..9018a44 100644
@@ -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"
arch/arm/mach-davinci/dm646x.c +1 -1
index 9eb87c1..56f8e6e 100644
@@ -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"
arch/arm/mach-davinci/include/mach/da8xx.h +5 -5
index a2f1f27..a273d06 100644
@@ -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;
arch/arm/mach-davinci/include/mach/tnetv107x.h +2 -2
index 83e5926..1656a02 100644
@@ -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 {
arch/arm/mach-davinci/usb.c +1 -1
index 23d2b6d..f77b953 100644
@@ -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
drivers/i2c/busses/i2c-davinci.c +1 -1
index 79b4bcb..79a2542 100644
@@ -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 ----------------------------------------------- */
drivers/input/keyboard/davinci_keyscan.c +1 -1
index 9d82b3a..d5bacbb 100644
@@ -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
drivers/media/video/davinci/vpbe_venc.c +1 -1
index b21ecc8..0302669 100644
@@ -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>
drivers/mmc/host/davinci_mmc.c +1 -1
index 7cf6c62..3dfd347 100644
@@ -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>
 
 /*
drivers/mtd/nand/davinci_nand.c +2 -2
index d94b03c..f1deb1e 100644
@@ -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
drivers/spi/spi-davinci.c +1 -1
index 9b2901f..3afe2f4 100644
@@ -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)
drivers/usb/host/ohci-da8xx.c +1 -1
index 269b1e0..0b815a8 100644
@@ -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."
drivers/usb/musb/da8xx.c +1 -1
index 0f9fcec..15a2627 100644
@@ -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"
include/linux/platform_data/asoc-davinci-evm.h renamed from arch/arm/mach-davinci/include/mach/asp.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/asp.h
rename to include/linux/platform_data/asoc-davinci-evm.h
include/linux/platform_data/i2c-davinci.h renamed from arch/arm/mach-davinci/include/mach/i2c.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/i2c.h
rename to include/linux/platform_data/i2c-davinci.h
include/linux/platform_data/keyscan-davinci.h renamed from arch/arm/mach-davinci/include/mach/keyscan.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/keyscan.h
rename to include/linux/platform_data/keyscan-davinci.h
include/linux/platform_data/mmc-davinci.h renamed from arch/arm/mach-davinci/include/mach/mmc.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/mmc.h
rename to include/linux/platform_data/mmc-davinci.h
include/linux/platform_data/mtd-davinci-aemif.h renamed from arch/arm/mach-davinci/include/mach/aemif.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/aemif.h
rename to include/linux/platform_data/mtd-davinci-aemif.h
include/linux/platform_data/mtd-davinci.h renamed from arch/arm/mach-davinci/include/mach/nand.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/nand.h
rename to include/linux/platform_data/mtd-davinci.h
include/linux/platform_data/spi-davinci.h renamed from arch/arm/mach-davinci/include/mach/spi.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/spi.h
rename to include/linux/platform_data/spi-davinci.h
include/linux/platform_data/usb-davinci.h renamed from arch/arm/mach-davinci/include/mach/usb.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/usb.h
rename to include/linux/platform_data/usb-davinci.h
sound/soc/davinci/davinci-evm.c +1 -1
index 10a2d8c..5717bed 100644
@@ -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>
sound/soc/davinci/davinci-i2s.c +1 -1
index 0a74b95..6e58828 100644
@@ -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"
sound/soc/davinci/davinci-mcasp.h +1 -1
index 4681acc..302aab2 100644
@@ -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
sound/soc/davinci/davinci-pcm.h +1 -1
index c0d6c9b..36d31cd 100644
@@ -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 {
Signature · 6 lines
1.7.10

_______________________________________________
Davinci-linux-open-source mailing list
Davinci-linux-open-source at linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

Regards,
Gururaja

author Acked-by Mark Brown Acked-by Greg Kroah-Hartman Acked-by Nicolas Pitre Acked-by Mauro Carvalho Chehab Acked-by Felipe Balbi
#6 lore raw

Re: [PATCH 02/16] ARM: davinci: move platform_data definitions

Quoted 11 lines · Gururaja
Quoted 4 lines · Arnd Bergmann
 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

Quoted 1 line

From d017cbf690ccbaf8561a83a0b3156f0921807939 Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
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 <[email protected]>
Acked-by Mark Brown <[email protected]>
Acked-by Greg Kroah-Hartman <[email protected]>
Acked-by Nicolas Pitre <[email protected]>
Acked-by Mauro Carvalho Chehab <[email protected]>
Acked-by Felipe Balbi <[email protected]>
Cc Sekhar Nori <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc "Ben Dooks" <[email protected]>
Cc "Wolfram Sang" <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Chris Ball <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Grant Likely <[email protected]>
Cc Alan Stern <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc davinci-linux-open-source at linux.davincidsp.com
arch/arm/mach-davinci/aemif.c +1 -1
index 1ce70a9..f091a90 100644
@@ -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 */
arch/arm/mach-davinci/board-da830-evm.c +4 -4
index 0031864..95b5e10 100644
@@ -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		""
 /*
arch/arm/mach-davinci/board-da850-evm.c +3 -3
index 0149fb4..1295e61 100644
@@ -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)
arch/arm/mach-davinci/board-dm355-evm.c +4 -4
index 1c7b1f4..88ebea8 100644
@@ -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"
arch/arm/mach-davinci/board-dm355-leopard.c +4 -4
index 8e77032..2f88103 100644
@@ -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"
arch/arm/mach-davinci/board-dm365-evm.c +4 -4
index 688a9c5..1b4a8ad 100644
@@ -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>
arch/arm/mach-davinci/board-dm644x-evm.c +5 -5
index d34ed55..ca72fc4 100644
@@ -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"
arch/arm/mach-davinci/board-dm646x-evm.c +3 -3
index 958679a..9944367 100644
@@ -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"
arch/arm/mach-davinci/board-mityomapl138.c +2 -2
index beecde3..43e4a0d 100644
@@ -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		""
arch/arm/mach-davinci/board-neuros-osd2.c +4 -4
index f6b9fc7..144bf31 100644
@@ -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"
arch/arm/mach-davinci/board-sffsdr.c +2 -2
index 9078acf..6957787 100644
@@ -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"
arch/arm/mach-davinci/davinci.h +1 -1
index 8db0fc6..a37fc44 100644
@@ -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>
arch/arm/mach-davinci/devices.c +2 -2
index d2f96662..3a42b6f 100644
@@ -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"
arch/arm/mach-davinci/dm355.c +1 -1
index 678cd99..adbde33 100644
@@ -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"
arch/arm/mach-davinci/dm365.c +2 -2
index a50d49de..719e22f 100644
@@ -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"
arch/arm/mach-davinci/include/mach/da8xx.h +4 -4
index a2f1f27..33e78ae 100644
@@ -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;
arch/arm/mach-davinci/include/mach/tnetv107x.h +2 -2
index 83e5926..1656a02 100644
@@ -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 {
arch/arm/mach-davinci/usb.c +1 -1
index 23d2b6d..f77b953 100644
@@ -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
drivers/i2c/busses/i2c-davinci.c +1 -1
index 79b4bcb..79a2542 100644
@@ -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 ----------------------------------------------- */
drivers/input/keyboard/davinci_keyscan.c +1 -1
index 9d82b3a..d5bacbb 100644
@@ -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
drivers/media/video/davinci/vpbe_venc.c +1 -1
index b21ecc8..0302669 100644
@@ -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>
drivers/mmc/host/davinci_mmc.c +1 -1
index 7cf6c62..3dfd347 100644
@@ -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>
 
 /*
drivers/mtd/nand/davinci_nand.c +2 -2
index d94b03c..f1deb1e 100644
@@ -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
drivers/spi/spi-davinci.c +1 -1
index 9b2901f..3afe2f4 100644
@@ -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)
drivers/usb/host/ohci-da8xx.c +1 -1
index 269b1e0..0b815a8 100644
@@ -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."
drivers/usb/musb/da8xx.c +1 -1
index 0f9fcec..15a2627 100644
@@ -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"
include/linux/platform_data/i2c-davinci.h renamed from arch/arm/mach-davinci/include/mach/i2c.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/i2c.h
rename to include/linux/platform_data/i2c-davinci.h
include/linux/platform_data/keyscan-davinci.h renamed from arch/arm/mach-davinci/include/mach/keyscan.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/keyscan.h
rename to include/linux/platform_data/keyscan-davinci.h
include/linux/platform_data/mmc-davinci.h renamed from arch/arm/mach-davinci/include/mach/mmc.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/mmc.h
rename to include/linux/platform_data/mmc-davinci.h
include/linux/platform_data/mtd-davinci-aemif.h renamed from arch/arm/mach-davinci/include/mach/aemif.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/aemif.h
rename to include/linux/platform_data/mtd-davinci-aemif.h
include/linux/platform_data/mtd-davinci.h renamed from arch/arm/mach-davinci/include/mach/nand.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/nand.h
rename to include/linux/platform_data/mtd-davinci.h
include/linux/platform_data/spi-davinci.h renamed from arch/arm/mach-davinci/include/mach/spi.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/spi.h
rename to include/linux/platform_data/spi-davinci.h
include/linux/platform_data/usb-davinci.h renamed from arch/arm/mach-davinci/include/mach/usb.h +0 -0
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/usb.h
rename to include/linux/platform_data/usb-davinci.h
#7 lore raw

RE: [PATCH 02/16] ARM: davinci: move platform_data definitions

Quoted 9 lines · Arnd Bergmann
Quoted 8 lines · Gururaja
Quoted 4 lines · Arnd Bergmann
 drivers/usb/musb/da8xx.c                                     |    2 +-
 .../asp.h => include/linux/platform_data/asoc-davinci-evm.h  |    0
Quoted 8 lines
Quoted 3 lines

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.

Quoted 2 lines

..snip..
..snip..

Regards,
Gururaja

author
#8 lore raw

PATCH 3/16 ARM: ep93xx: move platform_data definitions

In reply to Arnd Bergmann

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

This moves such data out of the ep93xx include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Grant Likely <[email protected]>
Cc Hartley Sweeten <[email protected]>
Cc Ryan Mallon <[email protected]>
Cc Jeff Garzik <[email protected]> (supporter:SERIAL ATA
Cc Vinod Koul <[email protected]>
Cc Dan Williams <[email protected]>
Cc Dmitry Torokhov <[email protected]> (maintainer:INPUT
Cc Florian Tobias Schandinat <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
Cc Mika Westerberg <[email protected]>
Cc Axel Lin <[email protected]>
---
 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%)
Documentation/spi/ep93xx_spi +1 -1
index d8eb01c..832ddce 100644
@@ -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
arch/arm/mach-ep93xx/core.c +3 -3
index 4afe52a..e85bf17 100644
@@ -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>
arch/arm/mach-ep93xx/dma.c +1 -1
index 16976d7..d8bfd02 100644
@@ -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"
arch/arm/mach-ep93xx/edb93xx.c +2 -2
index 337ab7c..b8f53d5 100644
@@ -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>
arch/arm/mach-ep93xx/simone.c +1 -1
index 33dc079..0eb3f17 100644
@@ -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>
arch/arm/mach-ep93xx/snappercl15.c +1 -1
index 01abd35..50043ee 100644
@@ -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>
arch/arm/mach-ep93xx/vision_ep9307.c +2 -2
index 2905a49..ba92e25 100644
@@ -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>
drivers/ata/pata_ep93xx.c +1 -1
index 6ef2e37..e056406 100644
@@ -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"
drivers/dma/ep93xx_dma.c +1 -1
index c64917e..4aeaea7 100644
@@ -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"
drivers/input/keyboard/ep93xx_keypad.c +1 -1
index c46fc81..7363402 100644
@@ -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
drivers/spi/spi-ep93xx.c +2 -2
index f97f1d2..3a21959 100644
@@ -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
drivers/video/ep93xx-fb.c +1 -1
index 345d962..f2c092da 100644
@@ -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 */
include/linux/platform_data/dma-ep93xx.h renamed from arch/arm/mach-ep93xx/include/mach/dma.h +0 -0
similarity index 100%
rename from arch/arm/mach-ep93xx/include/mach/dma.h
rename to include/linux/platform_data/dma-ep93xx.h
include/linux/platform_data/keypad-ep93xx.h renamed from arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h +0 -0
similarity index 100%
rename from arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
rename to include/linux/platform_data/keypad-ep93xx.h
include/linux/platform_data/spi-ep93xx.h renamed from arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h +0 -0
similarity index 100%
rename from arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h
rename to include/linux/platform_data/spi-ep93xx.h
include/linux/platform_data/video-ep93xx.h renamed from arch/arm/mach-ep93xx/include/mach/fb.h +0 -0
similarity index 100%
rename from arch/arm/mach-ep93xx/include/mach/fb.h
rename to include/linux/platform_data/video-ep93xx.h
sound/soc/ep93xx/ep93xx-ac97.c +1 -1
index bdffab3..c352165 100644
@@ -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"
 
 /*
sound/soc/ep93xx/ep93xx-i2s.c +1 -1
index 8df8f6d..ac4a751 100644
@@ -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"
sound/soc/ep93xx/ep93xx-pcm.c +1 -1
index 4eea98b..665d9c9 100644
@@ -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>
Signature · 1 line
1.7.10
Acked-by on v1 3/16
#9 lore raw

RE: [PATCH 03/16] ARM: ep93xx: move platform_data definitions

Quoted 38 lines · Arnd Bergmann

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

This moves such data out of the ep93xx include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Grant Likely <[email protected]>
Cc Hartley Sweeten <[email protected]>
Cc Ryan Mallon <[email protected]>
Cc Jeff Garzik <[email protected]> (supporter:SERIAL ATA
Cc Vinod Koul <[email protected]>
Cc Dan Williams <[email protected]>
Cc Dmitry Torokhov <[email protected]> (maintainer:INPUT
Cc Florian Tobias Schandinat <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
Cc Mika Westerberg <[email protected]>
Cc Axel Lin <[email protected]>
---
 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
Quoted 8 lines
 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 <[email protected]>

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

author
#10 lore raw

Re: [PATCH 03/16] ARM: ep93xx: move platform_data definitions

Quoted 5 lines · H Hartley Sweeten

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

Acked-by on v1 3/16
#11 lore raw

Re: [PATCH 03/16] ARM: ep93xx: move platform_data definitions

In reply to Arnd Bergmann
Quoted 7 lines · Arnd Bergmann

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

This moves such data out of the ep93xx include directories

Signed-off-by Arnd Bergmann <[email protected]>
Acked-by Ryan Mallon <[email protected]>
Quoted 262 lines
Cc Grant Likely <[email protected]>
Cc Hartley Sweeten <[email protected]>
Cc Ryan Mallon <[email protected]>
Cc Jeff Garzik <[email protected]> (supporter:SERIAL ATA
Cc Vinod Koul <[email protected]>
Cc Dan Williams <[email protected]>
Cc Dmitry Torokhov <[email protected]> (maintainer:INPUT
Cc Florian Tobias Schandinat <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
Cc Mika Westerberg <[email protected]>
Cc Axel Lin <[email protected]>
---
 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%)
Documentation/spi/ep93xx_spi +1 -1
index d8eb01c..832ddce 100644
@@ -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
arch/arm/mach-ep93xx/core.c +3 -3
index 4afe52a..e85bf17 100644
@@ -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>
arch/arm/mach-ep93xx/dma.c +1 -1
index 16976d7..d8bfd02 100644
@@ -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"
arch/arm/mach-ep93xx/edb93xx.c +2 -2
index 337ab7c..b8f53d5 100644
@@ -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>
arch/arm/mach-ep93xx/simone.c +1 -1
index 33dc079..0eb3f17 100644
@@ -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>
arch/arm/mach-ep93xx/snappercl15.c +1 -1
index 01abd35..50043ee 100644
@@ -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>
arch/arm/mach-ep93xx/vision_ep9307.c +2 -2
index 2905a49..ba92e25 100644
@@ -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>
drivers/ata/pata_ep93xx.c +1 -1
index 6ef2e37..e056406 100644
@@ -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"
drivers/dma/ep93xx_dma.c +1 -1
index c64917e..4aeaea7 100644
@@ -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"
drivers/input/keyboard/ep93xx_keypad.c +1 -1
index c46fc81..7363402 100644
@@ -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
drivers/spi/spi-ep93xx.c +2 -2
index f97f1d2..3a21959 100644
@@ -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
drivers/video/ep93xx-fb.c +1 -1
index 345d962..f2c092da 100644
@@ -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 */
include/linux/platform_data/dma-ep93xx.h renamed from arch/arm/mach-ep93xx/include/mach/dma.h +0 -0
similarity index 100%
rename from arch/arm/mach-ep93xx/include/mach/dma.h
rename to include/linux/platform_data/dma-ep93xx.h
include/linux/platform_data/keypad-ep93xx.h renamed from arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h +0 -0
similarity index 100%
rename from arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
rename to include/linux/platform_data/keypad-ep93xx.h
include/linux/platform_data/spi-ep93xx.h renamed from arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h +0 -0
similarity index 100%
rename from arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h
rename to include/linux/platform_data/spi-ep93xx.h
include/linux/platform_data/video-ep93xx.h renamed from arch/arm/mach-ep93xx/include/mach/fb.h +0 -0
similarity index 100%
rename from arch/arm/mach-ep93xx/include/mach/fb.h
rename to include/linux/platform_data/video-ep93xx.h
sound/soc/ep93xx/ep93xx-ac97.c +1 -1
index bdffab3..c352165 100644
@@ -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"
 
 /*
sound/soc/ep93xx/ep93xx-i2s.c +1 -1
index 8df8f6d..ac4a751 100644
@@ -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"
sound/soc/ep93xx/ep93xx-pcm.c +1 -1
index 4eea98b..665d9c9 100644
@@ -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>
Acked-by on v1 3/16
#12 lore raw

Re: [PATCH 03/16] ARM: ep93xx: move platform_data definitions

In reply to Arnd Bergmann
Quoted 8 lines · Arnd Bergmann

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

This moves such data out of the ep93xx include directories

 drivers/dma/ep93xx_dma.c                                         |    2 +-
Acked-by Vinod Koul <[email protected]>
Signature · 1 line
~Vinod
author
#13 lore raw

PATCH 4/16 ARM: imx: move platform_data definitions

In reply to Arnd Bergmann

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

This moves such data out of the imx include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Russell King <[email protected]>
Cc Vinod Koul <[email protected]>
Cc Dan Williams <[email protected]>
Cc "Ben Dooks (embedded platforms)" <[email protected]>
Cc "Wolfram Sang (embedded platforms)" <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Chris Ball <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Grant Likely <[email protected]>
Cc Alan Cox <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Alan Stern <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc Javier Martin <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Guennadi Liakhovetski <[email protected]>
---
 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%)
arch/arm/mach-imx/ehci-imx25.c +1 -1
index 05bb41d..412c583 100644
@@ -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
arch/arm/mach-imx/ehci-imx27.c +1 -1
index fa69419..cd6e1f8 100644
@@ -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
arch/arm/mach-imx/ehci-imx31.c +1 -1
index faad0f1..9a880c7 100644
@@ -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
arch/arm/mach-imx/ehci-imx35.c +1 -1
index 73574c3..779e16e 100644
@@ -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
arch/arm/mach-imx/ehci-imx5.c +1 -1
index a6a4afb..cf8d00e 100644
@@ -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
arch/arm/mach-imx/mach-mx31moboard.c +1 -1
index d46290b..459e754 100644
@@ -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"
arch/arm/mach-imx/mx1-camera-fiq-ksym.c +1 -1
index b09ee12..fb38436 100644
@@ -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);
arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c +1 -1
index 5955f5d..3793e47 100644
@@ -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) \
 	{								\
arch/arm/plat-mxc/include/mach/devices-common.h +16 -16
index a7f5bb1..9e3e3d8 100644
@@ -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;
arch/arm/plat-mxc/ssi-fiq-ksym.c +1 -1
index b5fad45..792090f 100644
@@ -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);
drivers/dma/imx-dma.c +1 -1
index 5084975..b90aaec 100644
@@ -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"
drivers/dma/imx-sdma.c +2 -2
index 1dc2a4a..1b781d6 100644
@@ -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"
drivers/i2c/busses/i2c-imx.c +1 -1
index 0722f86..b7907ba7 100644
@@ -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 ********************************************************************
 *******************************************************************************/
drivers/media/video/mx1_camera.c +1 -1
index 560a65a..bbe7099 100644
@@ -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
drivers/media/video/mx2_camera.c +1 -1
index ac17540..965427f 100644
@@ -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>
drivers/media/video/mx3_camera.c +2 -2
index af2297d..1481b0d 100644
@@ -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"
drivers/mmc/host/mxcmmc.c +2 -2
index 28ed52d..7b1161d 100644
@@ -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"
drivers/mmc/host/sdhci-esdhc-imx.c +1 -1
index e23f813..c4c504c 100644
@@ -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"
drivers/mtd/nand/mxc_nand.c +1 -1
index 6acc790..5683604 100644
@@ -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"
drivers/spi/spi-imx.c +1 -1
index e834ff8..63e7fc9 100644
@@ -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"
drivers/tty/serial/imx.c +1 -1
index d5c689d6..fc65ba2 100644
@@ -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 */
drivers/usb/gadget/imx_udc.c +1 -1
index dc53348..a0eb857 100644
@@ -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"
drivers/usb/host/ehci-mxc.c +1 -1
index 3420137..a6e2ea4 100644
@@ -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>
drivers/usb/host/imx21-hcd.h +1 -1
index 87b29fd..c005770 100644
@@ -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
drivers/video/imxfb.c +1 -1
index caad368..53ffdfc 100644
@@ -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>
 
 /*
drivers/video/mx3fb.c +2 -2
index c89f8a8..d738108 100644
@@ -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>
include/linux/platform_data/asoc-imx-ssi.h renamed from arch/arm/plat-mxc/include/mach/ssi.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/ssi.h
rename to include/linux/platform_data/asoc-imx-ssi.h
include/linux/platform_data/camera-mx1.h renamed from arch/arm/plat-mxc/include/mach/mx1_camera.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mx1_camera.h
rename to include/linux/platform_data/camera-mx1.h
include/linux/platform_data/camera-mx2.h renamed from arch/arm/plat-mxc/include/mach/mx2_cam.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mx2_cam.h
rename to include/linux/platform_data/camera-mx2.h
include/linux/platform_data/camera-mx3.h renamed from arch/arm/plat-mxc/include/mach/mx3_camera.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mx3_camera.h
rename to include/linux/platform_data/camera-mx3.h
include/linux/platform_data/dma-imx-sdma.h renamed from arch/arm/plat-mxc/include/mach/sdma.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/sdma.h
rename to include/linux/platform_data/dma-imx-sdma.h
include/linux/platform_data/dma-imx.h renamed from arch/arm/plat-mxc/include/mach/dma.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/dma.h
rename to include/linux/platform_data/dma-imx.h
include/linux/platform_data/i2c-imx.h renamed from arch/arm/plat-mxc/include/mach/i2c.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/i2c.h
rename to include/linux/platform_data/i2c-imx.h
include/linux/platform_data/mmc-esdhc-imx.h renamed from arch/arm/plat-mxc/include/mach/esdhc.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/esdhc.h
rename to include/linux/platform_data/mmc-esdhc-imx.h
include/linux/platform_data/mmc-mxcmmc.h renamed from arch/arm/plat-mxc/include/mach/mmc.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mmc.h
rename to include/linux/platform_data/mmc-mxcmmc.h
include/linux/platform_data/mtd-mxc_nand.h renamed from arch/arm/plat-mxc/include/mach/mxc_nand.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mxc_nand.h
rename to include/linux/platform_data/mtd-mxc_nand.h
include/linux/platform_data/serial-imx.h renamed from arch/arm/plat-mxc/include/mach/imx-uart.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/imx-uart.h
rename to include/linux/platform_data/serial-imx.h
include/linux/platform_data/spi-imx.h renamed from arch/arm/plat-mxc/include/mach/spi.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/spi.h
rename to include/linux/platform_data/spi-imx.h
include/linux/platform_data/usb-ehci-mxc.h renamed from arch/arm/plat-mxc/include/mach/mxc_ehci.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mxc_ehci.h
rename to include/linux/platform_data/usb-ehci-mxc.h
include/linux/platform_data/usb-imx_udc.h renamed from arch/arm/plat-mxc/include/mach/usb.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/usb.h
rename to include/linux/platform_data/usb-imx_udc.h
include/linux/platform_data/usb-mx2.h renamed from arch/arm/plat-mxc/include/mach/mx21-usbhost.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mx21-usbhost.h
rename to include/linux/platform_data/usb-mx2.h
include/linux/platform_data/video-imxfb.h renamed from arch/arm/plat-mxc/include/mach/imxfb.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/imxfb.h
rename to include/linux/platform_data/video-imxfb.h
include/linux/platform_data/video-mx3fb.h renamed from arch/arm/plat-mxc/include/mach/mx3fb.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mx3fb.h
rename to include/linux/platform_data/video-mx3fb.h
sound/soc/fsl/imx-pcm-dma.c +1 -1
index 48f9d88..89a7755 100644
@@ -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"
sound/soc/fsl/imx-pcm-fiq.c +1 -1
index ee27ba3..22c6130 100644
@@ -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"
sound/soc/fsl/imx-ssi.c +1 -1
index 81d7728..e6a17ba 100644
@@ -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"
sound/soc/fsl/imx-ssi.h +1 -1
index 5744e86..dc114bd 100644
@@ -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 {
Signature · 1 line
1.7.10
#14 lore raw

Re: [PATCH 04/16] ARM: imx: move platform_data definitions

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/

author
#15 lore raw

Re: [PATCH 04/16] ARM: imx: move platform_data definitions

Quoted 7 lines · Guennadi Liakhovetski

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

#16 lore raw

Re: [PATCH 04/16] ARM: imx: move platform_data definitions

Quoted 9 lines · Arnd Bergmann
Quoted 7 lines · Guennadi Liakhovetski

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.

Quoted 8 lines

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/

author
#17 lore raw

Re: [PATCH 04/16] ARM: imx: move platform_data definitions

Quoted 5 lines · Guennadi Liakhovetski

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

#18 lore raw

Re: [PATCH 04/16] ARM: imx: move platform_data definitions

Quoted 10 lines · Arnd Bergmann
Quoted 5 lines · Guennadi Liakhovetski

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.

Signature · 2 lines
Regards,
Shawn
maintainer Acked-by on v1 4/16
#19 lore raw

Re: [PATCH 04/16] ARM: imx: move platform_data definitions

In reply to Arnd Bergmann
Quoted 19 lines · Arnd Bergmann

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

This moves such data out of the imx include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Russell King <[email protected]>
Cc Vinod Koul <[email protected]>
Cc Dan Williams <[email protected]>
Cc "Ben Dooks (embedded platforms)" <[email protected]>
Cc "Wolfram Sang (embedded platforms)" <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Chris Ball <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Grant Likely <[email protected]>
Cc Alan Cox <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Quoted 8 lines
Cc Felipe Balbi <[email protected]>
Cc Alan Stern <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc Javier Martin <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Guennadi Liakhovetski <[email protected]>
Acked-by Sascha Hauer <[email protected]>

Both i.MX defconfigs still compile.

Sascha

Quoted 673 lines
---
 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%)
arch/arm/mach-imx/ehci-imx25.c +1 -1
index 05bb41d..412c583 100644
@@ -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
arch/arm/mach-imx/ehci-imx27.c +1 -1
index fa69419..cd6e1f8 100644
@@ -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
arch/arm/mach-imx/ehci-imx31.c +1 -1
index faad0f1..9a880c7 100644
@@ -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
arch/arm/mach-imx/ehci-imx35.c +1 -1
index 73574c3..779e16e 100644
@@ -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
arch/arm/mach-imx/ehci-imx5.c +1 -1
index a6a4afb..cf8d00e 100644
@@ -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
arch/arm/mach-imx/mach-mx31moboard.c +1 -1
index d46290b..459e754 100644
@@ -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"
arch/arm/mach-imx/mx1-camera-fiq-ksym.c +1 -1
index b09ee12..fb38436 100644
@@ -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);
arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c +1 -1
index 5955f5d..3793e47 100644
@@ -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) \
 	{								\
arch/arm/plat-mxc/include/mach/devices-common.h +16 -16
index a7f5bb1..9e3e3d8 100644
@@ -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;
arch/arm/plat-mxc/ssi-fiq-ksym.c +1 -1
index b5fad45..792090f 100644
@@ -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);
drivers/dma/imx-dma.c +1 -1
index 5084975..b90aaec 100644
@@ -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"
drivers/dma/imx-sdma.c +2 -2
index 1dc2a4a..1b781d6 100644
@@ -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"
drivers/i2c/busses/i2c-imx.c +1 -1
index 0722f86..b7907ba7 100644
@@ -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 ********************************************************************
 *******************************************************************************/
drivers/media/video/mx1_camera.c +1 -1
index 560a65a..bbe7099 100644
@@ -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
drivers/media/video/mx2_camera.c +1 -1
index ac17540..965427f 100644
@@ -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>
drivers/media/video/mx3_camera.c +2 -2
index af2297d..1481b0d 100644
@@ -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"
drivers/mmc/host/mxcmmc.c +2 -2
index 28ed52d..7b1161d 100644
@@ -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"
drivers/mmc/host/sdhci-esdhc-imx.c +1 -1
index e23f813..c4c504c 100644
@@ -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"
drivers/mtd/nand/mxc_nand.c +1 -1
index 6acc790..5683604 100644
@@ -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"
drivers/spi/spi-imx.c +1 -1
index e834ff8..63e7fc9 100644
@@ -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"
drivers/tty/serial/imx.c +1 -1
index d5c689d6..fc65ba2 100644
@@ -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 */
drivers/usb/gadget/imx_udc.c +1 -1
index dc53348..a0eb857 100644
@@ -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"
drivers/usb/host/ehci-mxc.c +1 -1
index 3420137..a6e2ea4 100644
@@ -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>
drivers/usb/host/imx21-hcd.h +1 -1
index 87b29fd..c005770 100644
@@ -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
drivers/video/imxfb.c +1 -1
index caad368..53ffdfc 100644
@@ -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>
 
 /*
drivers/video/mx3fb.c +2 -2
index c89f8a8..d738108 100644
@@ -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>
include/linux/platform_data/asoc-imx-ssi.h renamed from arch/arm/plat-mxc/include/mach/ssi.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/ssi.h
rename to include/linux/platform_data/asoc-imx-ssi.h
include/linux/platform_data/camera-mx1.h renamed from arch/arm/plat-mxc/include/mach/mx1_camera.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mx1_camera.h
rename to include/linux/platform_data/camera-mx1.h
include/linux/platform_data/camera-mx2.h renamed from arch/arm/plat-mxc/include/mach/mx2_cam.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mx2_cam.h
rename to include/linux/platform_data/camera-mx2.h
include/linux/platform_data/camera-mx3.h renamed from arch/arm/plat-mxc/include/mach/mx3_camera.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mx3_camera.h
rename to include/linux/platform_data/camera-mx3.h
include/linux/platform_data/dma-imx-sdma.h renamed from arch/arm/plat-mxc/include/mach/sdma.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/sdma.h
rename to include/linux/platform_data/dma-imx-sdma.h
include/linux/platform_data/dma-imx.h renamed from arch/arm/plat-mxc/include/mach/dma.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/dma.h
rename to include/linux/platform_data/dma-imx.h
include/linux/platform_data/i2c-imx.h renamed from arch/arm/plat-mxc/include/mach/i2c.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/i2c.h
rename to include/linux/platform_data/i2c-imx.h
include/linux/platform_data/mmc-esdhc-imx.h renamed from arch/arm/plat-mxc/include/mach/esdhc.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/esdhc.h
rename to include/linux/platform_data/mmc-esdhc-imx.h
include/linux/platform_data/mmc-mxcmmc.h renamed from arch/arm/plat-mxc/include/mach/mmc.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mmc.h
rename to include/linux/platform_data/mmc-mxcmmc.h
include/linux/platform_data/mtd-mxc_nand.h renamed from arch/arm/plat-mxc/include/mach/mxc_nand.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mxc_nand.h
rename to include/linux/platform_data/mtd-mxc_nand.h
include/linux/platform_data/serial-imx.h renamed from arch/arm/plat-mxc/include/mach/imx-uart.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/imx-uart.h
rename to include/linux/platform_data/serial-imx.h
include/linux/platform_data/spi-imx.h renamed from arch/arm/plat-mxc/include/mach/spi.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/spi.h
rename to include/linux/platform_data/spi-imx.h
include/linux/platform_data/usb-ehci-mxc.h renamed from arch/arm/plat-mxc/include/mach/mxc_ehci.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mxc_ehci.h
rename to include/linux/platform_data/usb-ehci-mxc.h
include/linux/platform_data/usb-imx_udc.h renamed from arch/arm/plat-mxc/include/mach/usb.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/usb.h
rename to include/linux/platform_data/usb-imx_udc.h
include/linux/platform_data/usb-mx2.h renamed from arch/arm/plat-mxc/include/mach/mx21-usbhost.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mx21-usbhost.h
rename to include/linux/platform_data/usb-mx2.h
include/linux/platform_data/video-imxfb.h renamed from arch/arm/plat-mxc/include/mach/imxfb.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/imxfb.h
rename to include/linux/platform_data/video-imxfb.h
include/linux/platform_data/video-mx3fb.h renamed from arch/arm/plat-mxc/include/mach/mx3fb.h +0 -0
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mx3fb.h
rename to include/linux/platform_data/video-mx3fb.h
sound/soc/fsl/imx-pcm-dma.c +1 -1
index 48f9d88..89a7755 100644
@@ -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"
sound/soc/fsl/imx-pcm-fiq.c +1 -1
index ee27ba3..22c6130 100644
@@ -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"
sound/soc/fsl/imx-ssi.c +1 -1
index 81d7728..e6a17ba 100644
@@ -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"
sound/soc/fsl/imx-ssi.h +1 -1
index 5744e86..dc114bd 100644
@@ -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 {
Signature · 7 lines
1.7.10


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 4 lines
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 |
Acked-by on v1 4/16
#20 lore raw

Re: [PATCH 04/16] ARM: imx: move platform_data definitions

In reply to Arnd Bergmann
Quoted 5 lines · Arnd Bergmann

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

This moves such data out of the imx include directories

For these:

Quoted 2 lines
 drivers/dma/imx-dma.c                              |    2 +-
 drivers/dma/imx-sdma.c                             |    4 +--
Acked-by Vinod Koul <[email protected]>
Signature · 1 line
~Vinod
author
#21 lore raw

PATCH 5/16 ARM: msm: move platform_data definitions

In reply to Arnd Bergmann

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

This moves such data out of the msm include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc David Brown <[email protected]>
Cc Daniel Walker <[email protected]>
Cc Bryan Huntsman <[email protected]>
Cc Chris Ball <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
Cc linux-arm-msm at 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%)
arch/arm/mach-msm/board-qsd8x50.c +1 -1
index c8fe0ed..b21bb4c 100644
@@ -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"
arch/arm/mach-msm/board-trout-mmc.c +1 -1
index 8650342..3723e55 100644
@@ -15,7 +15,7 @@
 
 #include <mach/vreg.h>
 
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-msm_sdcc.h>
 
 #include "devices.h"
arch/arm/mach-msm/board-trout-panel.c +1 -1
index 89bf6b4..f9a5db6 100644
@@ -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"
arch/arm/mach-msm/devices-msm7x00.c +1 -1
index 993780f..f66ee6e 100644
@@ -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[] = {
 	{
arch/arm/mach-msm/devices-msm7x30.c +1 -1
index 09b4f14..e90ab59 100644
@@ -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[] = {
 	{
arch/arm/mach-msm/devices-qsd8x50.c +1 -1
index 131633b..4db61d5 100644
@@ -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[] = {
arch/arm/mach-msm/include/mach/board.h +1 -1
index 435f8ed..70e0f98 100644
@@ -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 */
drivers/mmc/host/msm_sdcc.c +1 -1
index 1d14cda..7c0af0e 100644
@@ -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>
drivers/video/msm/mddi.c +1 -1
index b061d70..bf73f04 100644
@@ -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
drivers/video/msm/mddi_client_dummy.c +1 -1
index d2a091c..f1b0dfc 100644
@@ -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;
drivers/video/msm/mddi_client_nt35399.c +1 -1
index 7fcd67e..d7a5bf8 100644
@@ -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);
drivers/video/msm/mddi_client_toshiba.c +1 -1
index 053eb68..061d7df 100644
@@ -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
drivers/video/msm/mdp.c +1 -1
index cb2ddf1..d1f881e 100644
@@ -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>
drivers/video/msm/mdp_hw.h +1 -1
index d804774..a0bacf5 100644
@@ -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;
drivers/video/msm/mdp_ppp.c +1 -1
index 2b6564e..be6079c 100644
@@ -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"
drivers/video/msm/msm_fb.c +1 -1
index c6e3b4f..ec08a9e 100644
@@ -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>
include/linux/platform_data/mmc-msm_sdcc.h renamed from arch/arm/mach-msm/include/mach/mmc.h +0 -0
similarity index 100%
rename from arch/arm/mach-msm/include/mach/mmc.h
rename to include/linux/platform_data/mmc-msm_sdcc.h
include/linux/platform_data/video-msm_fb.h renamed from arch/arm/mach-msm/include/mach/msm_fb.h +0 -0
similarity index 100%
rename from arch/arm/mach-msm/include/mach/msm_fb.h
rename to include/linux/platform_data/video-msm_fb.h
Signature · 1 line
1.7.10
Acked-by on v1 5/16
#22 lore raw

Re: [PATCH 05/16] ARM: msm: move platform_data definitions

Quoted 27 lines · Arnd Bergmann

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

This moves such data out of the msm include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc David Brown <[email protected]>
Cc Daniel Walker <[email protected]>
Cc Bryan Huntsman <[email protected]>
Cc Chris Ball <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
Cc linux-arm-msm at 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 +-
Quoted 8 lines
 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 <[email protected]>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
author
#23 lore raw

PATCH 6/16 ARM: netx: move platform_data definitions

In reply to Arnd Bergmann

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

This moves such data out of the netx include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc netdev at vger.kernel.org
Cc Sascha Hauer <[email protected]>
---
 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%)
arch/arm/mach-netx/nxdb500.c +1 -1
index 180ea89..8b781ff 100644
@@ -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"
arch/arm/mach-netx/nxdkn.c +1 -1
index 58009e2..b26dbce 100644
@@ -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"
arch/arm/mach-netx/nxeb500hmi.c +1 -1
index 122e998..257382e 100644
@@ -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"
drivers/net/ethernet/netx-eth.c +1 -1
index 9d11ab7..63e7af4 100644
@@ -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 */
include/linux/platform_data/eth-netx.h renamed from arch/arm/mach-netx/include/mach/eth.h +0 -0
similarity index 100%
rename from arch/arm/mach-netx/include/mach/eth.h
rename to include/linux/platform_data/eth-netx.h
Signature · 1 line
1.7.10
maintainer Acked-by on v1 6/16
#24 lore raw

Re: [PATCH 06/16] ARM: netx: move platform_data definitions

Quoted 10 lines · Arnd Bergmann

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

This moves such data out of the netx include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc netdev at vger.kernel.org
Cc Sascha Hauer <[email protected]>
Acked-by Sascha Hauer <[email protected]>
Quoted 74 lines
---
 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%)
arch/arm/mach-netx/nxdb500.c +1 -1
index 180ea89..8b781ff 100644
@@ -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"
arch/arm/mach-netx/nxdkn.c +1 -1
index 58009e2..b26dbce 100644
@@ -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"
arch/arm/mach-netx/nxeb500hmi.c +1 -1
index 122e998..257382e 100644
@@ -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"
drivers/net/ethernet/netx-eth.c +1 -1
index 9d11ab7..63e7af4 100644
@@ -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 */
include/linux/platform_data/eth-netx.h renamed from arch/arm/mach-netx/include/mach/eth.h +0 -0
similarity index 100%
rename from arch/arm/mach-netx/include/mach/eth.h
rename to include/linux/platform_data/eth-netx.h
Signature · 7 lines
1.7.10


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 4 lines
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 |
author
#25 lore raw

PATCH 7/16 ARM: pxa: move platform_data definitions

In reply to Arnd Bergmann

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

This moves such data out of the pxa include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Eric Miao <[email protected]>
Cc Haojian Zhuang <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Daniel Ribeiro <[email protected]>
Cc Stefan Schmidt <[email protected]>
Cc Harald Welte <[email protected]>
Cc Philipp Zabel <[email protected]>
Cc Paul Parsons <[email protected]>
Cc Robert Jarzmik <[email protected]>
Cc Tomas Cech <[email protected]>
Cc Sergey Lapin <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Jeff Garzik <[email protected]>
Cc Vinod Koul <[email protected]>
Cc Dan Williams <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Chris Ball <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Samuel Ortiz <[email protected]>
Cc Alan Stern <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
Cc Guennadi Liakhovetski <[email protected]>
Cc Artem Bityutskiy <[email protected]>
Cc openezx-devel at lists.openezx.org
---
 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/sram.c                               |    2 +-
 arch/arm/mach-mmp/teton_bga.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/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 +++++-----
 drivers/ata/pata_pxa.c                                 |    2 +-
 drivers/dma/mmp_tdma.c                                 |    2 +-
 drivers/input/keyboard/pxa27x_keypad.c                 |    2 +-
 drivers/input/keyboard/pxa930_rotary.c                 |    2 +-
 drivers/input/mouse/pxa930_trkball.c                   |    2 +-
 drivers/media/video/pxa_camera.c                       |    2 +-
 drivers/mmc/host/pxamci.c                              |    2 +-
 drivers/mtd/nand/pxa3xx_nand.c                         |    2 +-
 drivers/net/irda/pxaficp_ir.c                          |    2 +-
 drivers/pcmcia/pxa2xx_viper.c                          |    2 +-
 drivers/usb/host/ohci-pxa27x.c                         |    4 ++--
 drivers/video/pxafb.c                                  |    2 +-
 .../linux/platform_data/asoc-palm27x.h                 |    0
 .../linux/platform_data/ata-pxa.h                      |    0
 .../linux/platform_data/camera-pxa.h                   |    0
 .../linux/platform_data/dma-mmp_tdma.h                 |    0
 .../linux/platform_data/irda-pxaficp.h                 |    0
 .../linux/platform_data/keyboard-pxa930_rotary.h       |    0
 .../linux/platform_data/keypad-pxa27x.h                |    0
 .../mmc.h => include/linux/platform_data/mmc-pxamci.h  |    0
 .../linux/platform_data/mouse-pxa930_trkball.h         |    0
 .../linux/platform_data/mtd-nand-pxa3xx.h              |    0
 .../linux/platform_data/pcmcia-pxa2xx_viper.h          |    0
 .../linux/platform_data/usb-ohci-pxa27x.h              |    0
 .../linux/platform_data/usb-pxa3xx-ulpi.h              |    0
 .../linux/platform_data/video-pxafb.h                  |    0
 sound/soc/pxa/palm27x.c                                |    2 +-
 86 files changed, 188 insertions(+), 188 deletions(-)
 rename arch/arm/mach-pxa/include/mach/palmasoc.h => include/linux/platform_data/asoc-palm27x.h (100%)
 rename arch/arm/mach-pxa/include/mach/pata_pxa.h => include/linux/platform_data/ata-pxa.h (100%)
 rename arch/arm/mach-pxa/include/mach/camera.h => include/linux/platform_data/camera-pxa.h (100%)
 rename arch/arm/mach-mmp/include/mach/sram.h => include/linux/platform_data/dma-mmp_tdma.h (100%)
 rename arch/arm/mach-pxa/include/mach/irda.h => include/linux/platform_data/irda-pxaficp.h (100%)
 rename arch/arm/mach-pxa/include/mach/pxa930_rotary.h => include/linux/platform_data/keyboard-pxa930_rotary.h (100%)
 rename arch/arm/plat-pxa/include/plat/pxa27x_keypad.h => include/linux/platform_data/keypad-pxa27x.h (100%)
 rename arch/arm/mach-pxa/include/mach/mmc.h => include/linux/platform_data/mmc-pxamci.h (100%)
 rename arch/arm/mach-pxa/include/mach/pxa930_trkball.h => include/linux/platform_data/mouse-pxa930_trkball.h (100%)
 rename arch/arm/plat-pxa/include/plat/pxa3xx_nand.h => include/linux/platform_data/mtd-nand-pxa3xx.h (100%)
 rename arch/arm/mach-pxa/include/mach/arcom-pcmcia.h => include/linux/platform_data/pcmcia-pxa2xx_viper.h (100%)
 rename arch/arm/mach-pxa/include/mach/ohci.h => include/linux/platform_data/usb-ohci-pxa27x.h (100%)
 rename arch/arm/mach-pxa/include/mach/pxa3xx-u2d.h => include/linux/platform_data/usb-pxa3xx-ulpi.h (100%)
 rename arch/arm/mach-pxa/include/mach/pxafb.h => include/linux/platform_data/video-pxafb.h (100%)
arch/arm/mach-mmp/aspenite.c +1 -1
index 223090b..e5dba9c 100644
@@ -27,7 +27,7 @@
 #include <mach/irqs.h>
 #include <video/pxa168fb.h>
 #include <linux/input.h>
-#include <plat/pxa27x_keypad.h>
+#include <linux/platform_data/keypad-pxa27x.h>
 
 #include "common.h"
arch/arm/mach-mmp/include/mach/mmp2.h +1 -1
index cba22fe..c4ca4d1 100644
@@ -13,7 +13,7 @@ extern void mmp2_clear_pmic_int(void);
 #include <linux/i2c.h>
 #include <linux/i2c/pxa-i2c.h>
 #include <mach/devices.h>
-#include <mach/sram.h>
+#include <linux/platform_data/dma-mmp_tdma.h>
 
 extern struct pxa_device_desc mmp2_device_uart1;
 extern struct pxa_device_desc mmp2_device_uart2;
arch/arm/mach-mmp/include/mach/pxa168.h +2 -2
index 09dcd6e..37632d9 100644
@@ -11,9 +11,9 @@ extern void pxa168_clear_keypad_wakeup(void);
 #include <linux/i2c.h>
 #include <linux/i2c/pxa-i2c.h>
 #include <mach/devices.h>
-#include <plat/pxa3xx_nand.h>
+#include <linux/platform_data/mtd-nand-pxa3xx.h>
 #include <video/pxa168fb.h>
-#include <plat/pxa27x_keypad.h>
+#include <linux/platform_data/keypad-pxa27x.h>
 #include <mach/cputype.h>
 #include <linux/pxa168_eth.h>
 #include <linux/platform_data/mv_usb.h>
arch/arm/mach-mmp/include/mach/pxa910.h +1 -1
index 793634c..3b58a3b 100644
@@ -9,7 +9,7 @@ extern void __init pxa910_init_irq(void);
 #include <linux/i2c.h>
 #include <linux/i2c/pxa-i2c.h>
 #include <mach/devices.h>
-#include <plat/pxa3xx_nand.h>
+#include <linux/platform_data/mtd-nand-pxa3xx.h>
 
 extern struct pxa_device_desc pxa910_device_uart1;
 extern struct pxa_device_desc pxa910_device_uart2;
arch/arm/mach-mmp/sram.c +1 -1
index 4304f95..b4899b0 100644
@@ -22,7 +22,7 @@
 #include <linux/slab.h>
 #include <linux/genalloc.h>
 
-#include <mach/sram.h>
+#include <linux/platform_data/dma-mmp_tdma.h>
 
 struct sram_bank_info {
 	char *pool_name;
arch/arm/mach-mmp/teton_bga.c +1 -1
index 42bef66..dd30ea7 100644
@@ -17,7 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/input.h>
-#include <plat/pxa27x_keypad.h>
+#include <linux/platform_data/keypad-pxa27x.h>
 #include <linux/i2c.h>
 
 #include <asm/mach-types.h>
arch/arm/mach-pxa/am200epd.c +1 -1
index ccdac4b..ffa6d81 100644
@@ -32,7 +32,7 @@
 
 #include <mach/pxa25x.h>
 #include <mach/gumstix.h>
-#include <mach/pxafb.h>
+#include <linux/platform_data/video-pxafb.h>
 
 #include "generic.h"
arch/arm/mach-pxa/am300epd.c +1 -1
index 76c4b94..3dfec1e 100644
@@ -30,7 +30,7 @@
 
 #include <mach/gumstix.h>
 #include <mach/mfp-pxa25x.h>
-#include <mach/pxafb.h>
+#include <linux/platform_data/video-pxafb.h>
 
 #include "generic.h"
arch/arm/mach-pxa/balloon3.c +4 -4
index 9244493..2082293 100644
@@ -45,12 +45,12 @@
 #include <mach/pxa27x.h>
 #include <mach/balloon3.h>
 #include <mach/audio.h>
-#include <mach/pxafb.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/mmc-pxamci.h>
 #include <mach/udc.h>
 #include <mach/pxa27x-udc.h>
-#include <mach/irda.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/irda-pxaficp.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
 
 #include "generic.h"
 #include "devices.h"
arch/arm/mach-pxa/cm-x270.c +2 -2
index 431ef56..2503db9 100644
@@ -22,8 +22,8 @@
 #include <linux/spi/libertas_spi.h>
 
 #include <mach/pxa27x.h>
-#include <mach/ohci.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
+#include <linux/platform_data/mmc-pxamci.h>
 
 #include "generic.h"
arch/arm/mach-pxa/cm-x2xx.c +1 -1
index 8fa4ad2..fc3afc7 100644
@@ -24,7 +24,7 @@
 #include <mach/pxa25x.h>
 #include <mach/pxa27x.h>
 #include <mach/audio.h>
-#include <mach/pxafb.h>
+#include <linux/platform_data/video-pxafb.h>
 #include <mach/smemc.h>
 
 #include <asm/hardware/it8152.h>
arch/arm/mach-pxa/cm-x300.c +5 -5
index 3e4e9fe..cc2b23a 100644
@@ -48,12 +48,12 @@
 
 #include <mach/pxa300.h>
 #include <mach/pxa27x-udc.h>
-#include <mach/pxafb.h>
-#include <mach/mmc.h>
-#include <mach/ohci.h>
-#include <plat/pxa3xx_nand.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
+#include <linux/platform_data/mtd-nand-pxa3xx.h>
 #include <mach/audio.h>
-#include <mach/pxa3xx-u2d.h>
+#include <linux/platform_data/usb-pxa3xx-ulpi.h>
 
 #include <asm/mach/map.h>
arch/arm/mach-pxa/colibri-evalboard.c +2 -2
index d28e802..8404b24 100644
@@ -23,8 +23,8 @@
 
 #include <mach/pxa27x.h>
 #include <mach/colibri.h>
-#include <mach/mmc.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <mach/pxa27x-udc.h>
 
 #include "generic.h"
arch/arm/mach-pxa/colibri-pxa270-income.c +3 -3
index 248804b..2d4a7b4 100644
@@ -27,11 +27,11 @@
 #include <asm/mach-types.h>
 
 #include <mach/hardware.h>
-#include <mach/mmc.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <mach/pxa27x.h>
 #include <mach/pxa27x-udc.h>
-#include <mach/pxafb.h>
+#include <linux/platform_data/video-pxafb.h>
 
 #include "devices.h"
 #include "generic.h"
arch/arm/mach-pxa/colibri-pxa300.c +2 -2
index bb6def8..a9c9c16 100644
@@ -24,8 +24,8 @@
 
 #include <mach/pxa300.h>
 #include <mach/colibri.h>
-#include <mach/ohci.h>
-#include <mach/pxafb.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
+#include <linux/platform_data/video-pxafb.h>
 #include <mach/audio.h>
 
 #include "generic.h"
arch/arm/mach-pxa/colibri-pxa320.c +2 -2
index d88e7b3..25515cd 100644
@@ -25,8 +25,8 @@
 
 #include <mach/pxa320.h>
 #include <mach/colibri.h>
-#include <mach/pxafb.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <mach/audio.h>
 #include <mach/pxa27x-udc.h>
 #include <mach/udc.h>
arch/arm/mach-pxa/colibri-pxa3xx.c +3 -3
index 68cc75f..8240291 100644
@@ -24,9 +24,9 @@
 #include <mach/pxa3xx-regs.h>
 #include <mach/mfp-pxa300.h>
 #include <mach/colibri.h>
-#include <mach/mmc.h>
-#include <mach/pxafb.h>
-#include <plat/pxa3xx_nand.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/mtd-nand-pxa3xx.h>
 
 #include "generic.h"
 #include "devices.h"
arch/arm/mach-pxa/corgi.c +2 -2
index c1fe32d..7c83f52 100644
@@ -46,8 +46,8 @@
 #include <asm/mach/irq.h>
 
 #include <mach/pxa25x.h>
-#include <mach/irda.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/irda-pxaficp.h>
+#include <linux/platform_data/mmc-pxamci.h>
 #include <mach/udc.h>
 #include <mach/corgi.h>
 #include <mach/sharpsl_pm.h>
arch/arm/mach-pxa/csb726.c +2 -2
index 67f0de3..7039f44 100644
@@ -23,8 +23,8 @@
 #include <asm/mach/arch.h>
 #include <mach/csb726.h>
 #include <mach/pxa27x.h>
-#include <mach/mmc.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <mach/audio.h>
 #include <mach/smemc.h>
arch/arm/mach-pxa/devices.c +8 -8
index 166eee5..e66bd1b 100644
@@ -8,17 +8,17 @@
 
 #include <asm/pmu.h>
 #include <mach/udc.h>
-#include <mach/pxa3xx-u2d.h>
-#include <mach/pxafb.h>
-#include <mach/mmc.h>
-#include <mach/irda.h>
+#include <linux/platform_data/usb-pxa3xx-ulpi.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/irda-pxaficp.h>
 #include <mach/irqs.h>
-#include <mach/ohci.h>
-#include <plat/pxa27x_keypad.h>
-#include <mach/camera.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
+#include <linux/platform_data/keypad-pxa27x.h>
+#include <linux/platform_data/camera-pxa.h>
 #include <mach/audio.h>
 #include <mach/hardware.h>
-#include <plat/pxa3xx_nand.h>
+#include <linux/platform_data/mtd-nand-pxa3xx.h>
 
 #include "devices.h"
 #include "generic.h"
arch/arm/mach-pxa/em-x270.c +5 -5
index 97f82ad..1b64114 100644
@@ -42,11 +42,11 @@
 #include <mach/pxa27x.h>
 #include <mach/pxa27x-udc.h>
 #include <mach/audio.h>
-#include <mach/pxafb.h>
-#include <mach/ohci.h>
-#include <mach/mmc.h>
-#include <plat/pxa27x_keypad.h>
-#include <mach/camera.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/keypad-pxa27x.h>
+#include <linux/platform_data/camera-pxa.h>
 
 #include "generic.h"
 #include "devices.h"
arch/arm/mach-pxa/eseries.c +2 -2
index 4cb2391..be2ee9b 100644
@@ -32,9 +32,9 @@
 #include <mach/eseries-gpio.h>
 #include <mach/eseries-irq.h>
 #include <mach/audio.h>
-#include <mach/pxafb.h>
+#include <linux/platform_data/video-pxafb.h>
 #include <mach/udc.h>
-#include <mach/irda.h>
+#include <linux/platform_data/irda-pxaficp.h>
 
 #include "devices.h"
 #include "generic.h"
arch/arm/mach-pxa/ezx.c +4 -4
index 15ab253..dc58fa0 100644
@@ -29,11 +29,11 @@
 #include <asm/mach/arch.h>
 
 #include <mach/pxa27x.h>
-#include <mach/pxafb.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <mach/hardware.h>
-#include <plat/pxa27x_keypad.h>
-#include <mach/camera.h>
+#include <linux/platform_data/keypad-pxa27x.h>
+#include <linux/platform_data/camera-pxa.h>
 
 #include "devices.h"
 #include "generic.h"
arch/arm/mach-pxa/gumstix.c +1 -1
index e529a35..60755a6 100644
@@ -41,7 +41,7 @@
 #include <asm/mach/flash.h>
 
 #include <mach/pxa25x.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-pxamci.h>
 #include <mach/udc.h>
 #include <mach/gumstix.h>
arch/arm/mach-pxa/hx4700.c +1 -1
index e6311988..5ecbd17 100644
@@ -45,7 +45,7 @@
 
 #include <mach/pxa27x.h>
 #include <mach/hx4700.h>
-#include <mach/irda.h>
+#include <linux/platform_data/irda-pxaficp.h>
 
 #include <sound/ak4641.h>
 #include <video/platform_lcd.h>
arch/arm/mach-pxa/idp.c +2 -2
index 6ff466b..c361519 100644
@@ -33,9 +33,9 @@
 
 #include <mach/pxa25x.h>
 #include <mach/idp.h>
-#include <mach/pxafb.h>
+#include <linux/platform_data/video-pxafb.h>
 #include <mach/bitfield.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-pxamci.h>
 
 #include "generic.h"
 #include "devices.h"
arch/arm/mach-pxa/littleton.c +4 -4
index 1fb86ed..402874f 100644
@@ -42,11 +42,11 @@
 #include <asm/mach/irq.h>
 
 #include <mach/pxa300.h>
-#include <mach/pxafb.h>
-#include <mach/mmc.h>
-#include <plat/pxa27x_keypad.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/keypad-pxa27x.h>
 #include <mach/littleton.h>
-#include <plat/pxa3xx_nand.h>
+#include <linux/platform_data/mtd-nand-pxa3xx.h>
 
 #include "generic.h"
arch/arm/mach-pxa/lpd270.c +4 -4
index cee9ce2..1a63eaa 100644
@@ -41,10 +41,10 @@
 #include <mach/pxa27x.h>
 #include <mach/lpd270.h>
 #include <mach/audio.h>
-#include <mach/pxafb.h>
-#include <mach/mmc.h>
-#include <mach/irda.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/irda-pxaficp.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <mach/smemc.h>
 
 #include "generic.h"
arch/arm/mach-pxa/lubbock.c +3 -3
index 0ca0db7..44dd756 100644
@@ -46,9 +46,9 @@
 #include <mach/audio.h>
 #include <mach/lubbock.h>
 #include <mach/udc.h>
-#include <mach/irda.h>
-#include <mach/pxafb.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/irda-pxaficp.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/mmc-pxamci.h>
 #include <mach/pm.h>
 #include <mach/smemc.h>
arch/arm/mach-pxa/magician.c +4 -4
index 39561dc..f792240 100644
@@ -38,10 +38,10 @@
 
 #include <mach/pxa27x.h>
 #include <mach/magician.h>
-#include <mach/pxafb.h>
-#include <mach/mmc.h>
-#include <mach/irda.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/irda-pxaficp.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
 
 #include "devices.h"
 #include "generic.h"
arch/arm/mach-pxa/mainstone.c +5 -5
index 1aebaf7..5d94757 100644
@@ -45,11 +45,11 @@
 #include <mach/pxa27x.h>
 #include <mach/mainstone.h>
 #include <mach/audio.h>
-#include <mach/pxafb.h>
-#include <mach/mmc.h>
-#include <mach/irda.h>
-#include <mach/ohci.h>
-#include <plat/pxa27x_keypad.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/irda-pxaficp.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
+#include <linux/platform_data/keypad-pxa27x.h>
 #include <mach/smemc.h>
 
 #include "generic.h"
arch/arm/mach-pxa/mioa701.c +4 -4
index bf99022..2831308 100644
@@ -46,12 +46,12 @@
 
 #include <mach/pxa27x.h>
 #include <mach/regs-rtc.h>
-#include <plat/pxa27x_keypad.h>
-#include <mach/pxafb.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/keypad-pxa27x.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/mmc-pxamci.h>
 #include <mach/udc.h>
 #include <mach/pxa27x-udc.h>
-#include <mach/camera.h>
+#include <linux/platform_data/camera-pxa.h>
 #include <mach/audio.h>
 #include <mach/smemc.h>
 #include <media/soc_camera.h>
arch/arm/mach-pxa/mxm8x10.c +4 -4
index 83570a7..d04ed49 100644
@@ -24,11 +24,11 @@
 #include <linux/gpio.h>
 #include <linux/i2c/pxa-i2c.h>
 
-#include <plat/pxa3xx_nand.h>
+#include <linux/platform_data/mtd-nand-pxa3xx.h>
 
-#include <mach/pxafb.h>
-#include <mach/mmc.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <mach/pxa320.h>
 
 #include <mach/mxm8x10.h>
arch/arm/mach-pxa/palm27x.c +4 -4
index dad71cf..17d4c53 100644
@@ -29,11 +29,11 @@
 
 #include <mach/pxa27x.h>
 #include <mach/audio.h>
-#include <mach/mmc.h>
-#include <mach/pxafb.h>
-#include <mach/irda.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/irda-pxaficp.h>
 #include <mach/udc.h>
-#include <mach/palmasoc.h>
+#include <linux/platform_data/asoc-palm27x.h>
 #include <mach/palm27x.h>
 
 #include "generic.h"
arch/arm/mach-pxa/palmld.c +5 -5
index 31e0433d..8bcc96e 100644
@@ -35,11 +35,11 @@
 #include <mach/pxa27x.h>
 #include <mach/audio.h>
 #include <mach/palmld.h>
-#include <mach/mmc.h>
-#include <mach/pxafb.h>
-#include <mach/irda.h>
-#include <plat/pxa27x_keypad.h>
-#include <mach/palmasoc.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/irda-pxaficp.h>
+#include <linux/platform_data/keypad-pxa27x.h>
+#include <linux/platform_data/asoc-palm27x.h>
 #include <mach/palm27x.h>
 
 #include "generic.h"
arch/arm/mach-pxa/palmt5.c +5 -5
index 0f6bd4f..5ca7b90 100644
@@ -36,12 +36,12 @@
 #include <mach/pxa27x.h>
 #include <mach/audio.h>
 #include <mach/palmt5.h>
-#include <mach/mmc.h>
-#include <mach/pxafb.h>
-#include <mach/irda.h>
-#include <plat/pxa27x_keypad.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/irda-pxaficp.h>
+#include <linux/platform_data/keypad-pxa27x.h>
 #include <mach/udc.h>
-#include <mach/palmasoc.h>
+#include <linux/platform_data/asoc-palm27x.h>
 #include <mach/palm27x.h>
 
 #include "generic.h"
arch/arm/mach-pxa/palmtc.c +3 -3
index e2d97ee..ca924cf 100644
@@ -34,9 +34,9 @@
 #include <mach/pxa25x.h>
 #include <mach/audio.h>
 #include <mach/palmtc.h>
-#include <mach/mmc.h>
-#include <mach/pxafb.h>
-#include <mach/irda.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/irda-pxaficp.h>
 #include <mach/udc.h>
 
 #include "generic.h"
arch/arm/mach-pxa/palmte2.c +4 -4
index c054827..997e6da 100644
@@ -34,11 +34,11 @@
 #include <mach/pxa25x.h>
 #include <mach/audio.h>
 #include <mach/palmte2.h>
-#include <mach/mmc.h>
-#include <mach/pxafb.h>
-#include <mach/irda.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/irda-pxaficp.h>
 #include <mach/udc.h>
-#include <mach/palmasoc.h>
+#include <linux/platform_data/asoc-palm27x.h>
 
 #include "generic.h"
 #include "devices.h"
arch/arm/mach-pxa/palmtreo.c +7 -7
index fbdebee..3f3c48f 100644
@@ -35,15 +35,15 @@
 #include <mach/pxa27x-udc.h>
 #include <mach/audio.h>
 #include <mach/palmtreo.h>
-#include <mach/mmc.h>
-#include <mach/pxafb.h>
-#include <mach/irda.h>
-#include <plat/pxa27x_keypad.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/irda-pxaficp.h>
+#include <linux/platform_data/keypad-pxa27x.h>
 #include <mach/udc.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <mach/pxa2xx-regs.h>
-#include <mach/palmasoc.h>
-#include <mach/camera.h>
+#include <linux/platform_data/asoc-palm27x.h>
+#include <linux/platform_data/camera-pxa.h>
 #include <mach/palm27x.h>
 
 #include <sound/pxa2xx-lib.h>
arch/arm/mach-pxa/palmtx.c +5 -5
index 0da35dc..8b43666 100644
@@ -40,12 +40,12 @@
 #include <mach/pxa27x.h>
 #include <mach/audio.h>
 #include <mach/palmtx.h>
-#include <mach/mmc.h>
-#include <mach/pxafb.h>
-#include <mach/irda.h>
-#include <plat/pxa27x_keypad.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/irda-pxaficp.h>
+#include <linux/platform_data/keypad-pxa27x.h>
 #include <mach/udc.h>
-#include <mach/palmasoc.h>
+#include <linux/platform_data/asoc-palm27x.h>
 #include <mach/palm27x.h>
 
 #include "generic.h"
arch/arm/mach-pxa/palmz72.c +6 -6
index a97b599..8cdd4f5 100644
@@ -40,16 +40,16 @@
 #include <mach/pxa27x.h>
 #include <mach/audio.h>
 #include <mach/palmz72.h>
-#include <mach/mmc.h>
-#include <mach/pxafb.h>
-#include <mach/irda.h>
-#include <plat/pxa27x_keypad.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/irda-pxaficp.h>
+#include <linux/platform_data/keypad-pxa27x.h>
 #include <mach/udc.h>
-#include <mach/palmasoc.h>
+#include <linux/platform_data/asoc-palm27x.h>
 #include <mach/palm27x.h>
 
 #include <mach/pm.h>
-#include <mach/camera.h>
+#include <linux/platform_data/camera-pxa.h>
 
 #include <media/soc_camera.h>
arch/arm/mach-pxa/pcm990-baseboard.c +4 -4
index cb723e8..113c57a 100644
@@ -28,14 +28,14 @@
 
 #include <media/soc_camera.h>
 
-#include <mach/camera.h>
+#include <linux/platform_data/camera-pxa.h>
 #include <asm/mach/map.h>
 #include <mach/pxa27x.h>
 #include <mach/audio.h>
-#include <mach/mmc.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <mach/pcm990_baseboard.h>
-#include <mach/pxafb.h>
+#include <linux/platform_data/video-pxafb.h>
 
 #include "devices.h"
 #include "generic.h"
arch/arm/mach-pxa/poodle.c +3 -3
index 89d98c8..2910bb9 100644
@@ -40,11 +40,11 @@
 #include <asm/mach/irq.h>
 
 #include <mach/pxa25x.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-pxamci.h>
 #include <mach/udc.h>
-#include <mach/irda.h>
+#include <linux/platform_data/irda-pxaficp.h>
 #include <mach/poodle.h>
-#include <mach/pxafb.h>
+#include <linux/platform_data/video-pxafb.h>
 
 #include <asm/hardware/scoop.h>
 #include <asm/hardware/locomo.h>
arch/arm/mach-pxa/pxa27x.c +1 -1
index 4726c246d..8047ee0 100644
@@ -30,7 +30,7 @@
 #include <mach/irqs.h>
 #include <mach/pxa27x.h>
 #include <mach/reset.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <mach/pm.h>
 #include <mach/dma.h>
 #include <mach/smemc.h>
arch/arm/mach-pxa/pxa2xx.c +1 -1
index f8ec854..447dcbb 100644
@@ -19,7 +19,7 @@
 #include <mach/pxa2xx-regs.h>
 #include <mach/mfp-pxa25x.h>
 #include <mach/reset.h>
-#include <mach/irda.h>
+#include <linux/platform_data/irda-pxaficp.h>
 
 void pxa2xx_clear_reset_status(unsigned int mask)
 {
arch/arm/mach-pxa/pxa3xx-ulpi.c +1 -1
index 5ead6d4..7dbe3cc 100644
@@ -27,7 +27,7 @@
 
 #include <mach/hardware.h>
 #include <mach/regs-u2d.h>
-#include <mach/pxa3xx-u2d.h>
+#include <linux/platform_data/usb-pxa3xx-ulpi.h>
 
 struct pxa3xx_u2d_ulpi {
 	struct clk		*clk;
arch/arm/mach-pxa/pxa3xx.c +1 -1
index dffb7e8..f65147c 100644
@@ -27,7 +27,7 @@
 #include <mach/hardware.h>
 #include <mach/pxa3xx-regs.h>
 #include <mach/reset.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <mach/pm.h>
 #include <mach/dma.h>
 #include <mach/smemc.h>
arch/arm/mach-pxa/raumfeld.c +4 -4
index d89d87ae..25b08bf 100644
@@ -49,10 +49,10 @@
 #include <asm/mach/arch.h>
 
 #include <mach/pxa300.h>
-#include <mach/ohci.h>
-#include <mach/pxafb.h>
-#include <mach/mmc.h>
-#include <plat/pxa3xx_nand.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/mtd-nand-pxa3xx.h>
 
 #include "generic.h"
 #include "devices.h"
arch/arm/mach-pxa/saar.c +1 -1
index 86c95a5..08d87a5 100644
@@ -32,7 +32,7 @@
 #include <asm/mach/flash.h>
 
 #include <mach/pxa930.h>
-#include <mach/pxafb.h>
+#include <linux/platform_data/video-pxafb.h>
 
 #include "devices.h"
 #include "generic.h"
arch/arm/mach-pxa/spitz.c +4 -4
index 363d91b..2073f0e 100644
@@ -41,10 +41,10 @@
 #include <mach/pxa27x.h>
 #include <mach/pxa27x-udc.h>
 #include <mach/reset.h>
-#include <mach/irda.h>
-#include <mach/mmc.h>
-#include <mach/ohci.h>
-#include <mach/pxafb.h>
+#include <linux/platform_data/irda-pxaficp.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
+#include <linux/platform_data/video-pxafb.h>
 #include <mach/spitz.h>
 #include <mach/sharpsl_pm.h>
 #include <mach/smemc.h>
arch/arm/mach-pxa/stargate2.c +1 -1
index 30b1b0b..08ea7a8 100644
@@ -44,7 +44,7 @@
 #include <asm/mach/flash.h>
 
 #include <mach/pxa27x.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-pxamci.h>
 #include <mach/udc.h>
 #include <mach/pxa27x-udc.h>
 #include <mach/smemc.h>
arch/arm/mach-pxa/tavorevb.c +2 -2
index 736bfdc..1a25f8a 100644
@@ -24,8 +24,8 @@
 #include <asm/mach/arch.h>
 
 #include <mach/pxa930.h>
-#include <mach/pxafb.h>
-#include <plat/pxa27x_keypad.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/keypad-pxa27x.h>
 
 #include "devices.h"
 #include "generic.h"
arch/arm/mach-pxa/tosa.c +2 -2
index 4d4eb60..233629e 100644
@@ -42,8 +42,8 @@
 
 #include <mach/pxa25x.h>
 #include <mach/reset.h>
-#include <mach/irda.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/irda-pxaficp.h>
+#include <linux/platform_data/mmc-pxamci.h>
 #include <mach/udc.h>
 #include <mach/tosa_bt.h>
 #include <mach/audio.h>
arch/arm/mach-pxa/trizeps4.c +4 -4
index 166dd32..fbbcbed 100644
@@ -43,10 +43,10 @@
 #include <mach/pxa27x.h>
 #include <mach/trizeps4.h>
 #include <mach/audio.h>
-#include <mach/pxafb.h>
-#include <mach/mmc.h>
-#include <mach/irda.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/irda-pxaficp.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <mach/smemc.h>
 
 #include "generic.h"
arch/arm/mach-pxa/viper.c +2 -2
index 130379f..392412c 100644
@@ -48,9 +48,9 @@
 
 #include <mach/pxa25x.h>
 #include <mach/audio.h>
-#include <mach/pxafb.h>
+#include <linux/platform_data/video-pxafb.h>
 #include <mach/regs-uart.h>
-#include <mach/arcom-pcmcia.h>
+#include <linux/platform_data/pcmcia-pxa2xx_viper.h>
 #include <mach/viper.h>
 
 #include <asm/setup.h>
arch/arm/mach-pxa/vpac270.c +4 -4
index e1740ac..491b6c9 100644
@@ -33,12 +33,12 @@
 #include <mach/pxa27x.h>
 #include <mach/audio.h>
 #include <mach/vpac270.h>
-#include <mach/mmc.h>
-#include <mach/pxafb.h>
-#include <mach/ohci.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <mach/pxa27x-udc.h>
 #include <mach/udc.h>
-#include <mach/pata_pxa.h>
+#include <linux/platform_data/ata-pxa.h>
 
 #include "generic.h"
 #include "devices.h"
arch/arm/mach-pxa/z2.c +3 -3
index b9320cb..97529fa 100644
@@ -37,9 +37,9 @@
 #include <mach/pxa27x.h>
 #include <mach/mfp-pxa27x.h>
 #include <mach/z2.h>
-#include <mach/pxafb.h>
-#include <mach/mmc.h>
-#include <plat/pxa27x_keypad.h>
+#include <linux/platform_data/video-pxafb.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/keypad-pxa27x.h>
 #include <mach/pm.h>
 
 #include "generic.h"
arch/arm/mach-pxa/zeus.c +4 -4
index af3d4f7..abd3aa1 100644
@@ -38,14 +38,14 @@
 
 #include <mach/pxa27x.h>
 #include <mach/regs-uart.h>
-#include <mach/ohci.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
+#include <linux/platform_data/mmc-pxamci.h>
 #include <mach/pxa27x-udc.h>
 #include <mach/udc.h>
-#include <mach/pxafb.h>
+#include <linux/platform_data/video-pxafb.h>
 #include <mach/pm.h>
 #include <mach/audio.h>
-#include <mach/arcom-pcmcia.h>
+#include <linux/platform_data/pcmcia-pxa2xx_viper.h>
 #include <mach/zeus.h>
 #include <mach/smemc.h>
arch/arm/mach-pxa/zylonite.c +5 -5
index 98eec80..226279f 100644
@@ -26,12 +26,12 @@
 #include <asm/mach/arch.h>
 #include <mach/pxa3xx.h>
 #include <mach/audio.h>
-#include <mach/pxafb.h>
+#include <linux/platform_data/video-pxafb.h>
 #include <mach/zylonite.h>
-#include <mach/mmc.h>
-#include <mach/ohci.h>
-#include <plat/pxa27x_keypad.h>
-#include <plat/pxa3xx_nand.h>
+#include <linux/platform_data/mmc-pxamci.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
+#include <linux/platform_data/keypad-pxa27x.h>
+#include <linux/platform_data/mtd-nand-pxa3xx.h>
 
 #include "devices.h"
 #include "generic.h"
drivers/ata/pata_pxa.c +1 -1
index 0bb0fb7..4b8ba55 100644
@@ -32,7 +32,7 @@
 #include <scsi/scsi_host.h>
 
 #include <mach/pxa2xx-regs.h>
-#include <mach/pata_pxa.h>
+#include <linux/platform_data/ata-pxa.h>
 #include <mach/dma.h>
 
 #define DRV_NAME	"pata_pxa"
drivers/dma/mmp_tdma.c +1 -1
index 8a15cf2..07fa486 100644
@@ -19,7 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/device.h>
 #include <mach/regs-icu.h>
-#include <mach/sram.h>
+#include <linux/platform_data/dma-mmp_tdma.h>
 
 #include "dmaengine.h"
drivers/input/keyboard/pxa27x_keypad.c +1 -1
index 7f7b724..803ff6f 100644
@@ -32,7 +32,7 @@
 #include <asm/mach/map.h>
 
 #include <mach/hardware.h>
-#include <plat/pxa27x_keypad.h>
+#include <linux/platform_data/keypad-pxa27x.h>
 /*
  * Keypad Controller registers
  */
drivers/input/keyboard/pxa930_rotary.c +1 -1
index d7f1134..41488f9 100644
@@ -15,7 +15,7 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 
-#include <mach/pxa930_rotary.h>
+#include <linux/platform_data/keyboard-pxa930_rotary.h>
 
 #define SBCR	(0x04)
 #define ERCR	(0x0c)
drivers/input/mouse/pxa930_trkball.c +1 -1
index a9e4bfd..4fe055f 100644
@@ -20,7 +20,7 @@
 #include <linux/slab.h>
 
 #include <mach/hardware.h>
-#include <mach/pxa930_trkball.h>
+#include <linux/platform_data/mouse-pxa930_trkball.h>
 
 /* Trackball Controller Register Definitions */
 #define TBCR		(0x000C)
drivers/media/video/pxa_camera.c +1 -1
index 9c21e01..1e3776d 100644
@@ -37,7 +37,7 @@
 #include <linux/videodev2.h>
 
 #include <mach/dma.h>
-#include <mach/camera.h>
+#include <linux/platform_data/camera-pxa.h>
 
 #define PXA_CAM_VERSION "0.0.6"
 #define PXA_CAM_DRV_NAME "pxa27x-camera"
drivers/mmc/host/pxamci.c +1 -1
index cb2dc0e..ca3915d 100644
@@ -35,7 +35,7 @@
 
 #include <mach/hardware.h>
 #include <mach/dma.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-pxamci.h>
 
 #include "pxamci.h"
drivers/mtd/nand/pxa3xx_nand.c +1 -1
index 252aaef..c53502f 100644
@@ -24,7 +24,7 @@
 #include <linux/slab.h>
 
 #include <mach/dma.h>
-#include <plat/pxa3xx_nand.h>
+#include <linux/platform_data/mtd-nand-pxa3xx.h>
 
 #define	CHIP_DELAY_TIMEOUT	(2 * HZ/10)
 #define NAND_STOP_DELAY		(2 * HZ/50)
drivers/net/irda/pxaficp_ir.c +1 -1
index 8d54767..aa4b947 100644
@@ -28,7 +28,7 @@
 #include <net/irda/irda_device.h>
 
 #include <mach/dma.h>
-#include <mach/irda.h>
+#include <linux/platform_data/irda-pxaficp.h>
 #include <mach/regs-uart.h>
 #include <mach/regs-ost.h>
drivers/pcmcia/pxa2xx_viper.c +1 -1
index cb0c37e..a76f495 100644
@@ -25,7 +25,7 @@
 
 #include <asm/irq.h>
 
-#include <mach/arcom-pcmcia.h>
+#include <linux/platform_data/pcmcia-pxa2xx_viper.h>
 
 #include "soc_common.h"
 #include "pxa2xx_base.h"
drivers/usb/host/ohci-pxa27x.c +2 -2
index e1a3cc6..955c410 100644
@@ -24,8 +24,8 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <mach/hardware.h>
-#include <mach/ohci.h>
-#include <mach/pxa3xx-u2d.h>
+#include <linux/platform_data/usb-ohci-pxa27x.h>
+#include <linux/platform_data/usb-pxa3xx-ulpi.h>
 
 /*
  * UHC: USB Host Controller (OHCI-like) register definitions
drivers/video/pxafb.c +1 -1
index 3f90255..4fa2ad4 100644
@@ -61,7 +61,7 @@
 #include <asm/irq.h>
 #include <asm/div64.h>
 #include <mach/bitfield.h>
-#include <mach/pxafb.h>
+#include <linux/platform_data/video-pxafb.h>
 
 /*
  * Complain if VAR is out of range.
include/linux/platform_data/asoc-palm27x.h renamed from arch/arm/mach-pxa/include/mach/palmasoc.h +0 -0
similarity index 100%
rename from arch/arm/mach-pxa/include/mach/palmasoc.h
rename to include/linux/platform_data/asoc-palm27x.h
include/linux/platform_data/ata-pxa.h renamed from arch/arm/mach-pxa/include/mach/pata_pxa.h +0 -0
similarity index 100%
rename from arch/arm/mach-pxa/include/mach/pata_pxa.h
rename to include/linux/platform_data/ata-pxa.h
include/linux/platform_data/camera-pxa.h renamed from arch/arm/mach-pxa/include/mach/camera.h +0 -0
similarity index 100%
rename from arch/arm/mach-pxa/include/mach/camera.h
rename to include/linux/platform_data/camera-pxa.h
include/linux/platform_data/dma-mmp_tdma.h renamed from arch/arm/mach-mmp/include/mach/sram.h +0 -0
similarity index 100%
rename from arch/arm/mach-mmp/include/mach/sram.h
rename to include/linux/platform_data/dma-mmp_tdma.h
include/linux/platform_data/irda-pxaficp.h renamed from arch/arm/mach-pxa/include/mach/irda.h +0 -0
similarity index 100%
rename from arch/arm/mach-pxa/include/mach/irda.h
rename to include/linux/platform_data/irda-pxaficp.h
include/linux/platform_data/keyboard-pxa930_rotary.h renamed from arch/arm/mach-pxa/include/mach/pxa930_rotary.h +0 -0
similarity index 100%
rename from arch/arm/mach-pxa/include/mach/pxa930_rotary.h
rename to include/linux/platform_data/keyboard-pxa930_rotary.h
include/linux/platform_data/keypad-pxa27x.h renamed from arch/arm/plat-pxa/include/plat/pxa27x_keypad.h +0 -0
similarity index 100%
rename from arch/arm/plat-pxa/include/plat/pxa27x_keypad.h
rename to include/linux/platform_data/keypad-pxa27x.h
include/linux/platform_data/mmc-pxamci.h renamed from arch/arm/mach-pxa/include/mach/mmc.h +0 -0
similarity index 100%
rename from arch/arm/mach-pxa/include/mach/mmc.h
rename to include/linux/platform_data/mmc-pxamci.h
include/linux/platform_data/mouse-pxa930_trkball.h renamed from arch/arm/mach-pxa/include/mach/pxa930_trkball.h +0 -0
similarity index 100%
rename from arch/arm/mach-pxa/include/mach/pxa930_trkball.h
rename to include/linux/platform_data/mouse-pxa930_trkball.h
include/linux/platform_data/mtd-nand-pxa3xx.h renamed from arch/arm/plat-pxa/include/plat/pxa3xx_nand.h +0 -0
similarity index 100%
rename from arch/arm/plat-pxa/include/plat/pxa3xx_nand.h
rename to include/linux/platform_data/mtd-nand-pxa3xx.h
include/linux/platform_data/pcmcia-pxa2xx_viper.h renamed from arch/arm/mach-pxa/include/mach/arcom-pcmcia.h +0 -0
similarity index 100%
rename from arch/arm/mach-pxa/include/mach/arcom-pcmcia.h
rename to include/linux/platform_data/pcmcia-pxa2xx_viper.h
include/linux/platform_data/usb-ohci-pxa27x.h renamed from arch/arm/mach-pxa/include/mach/ohci.h +0 -0
similarity index 100%
rename from arch/arm/mach-pxa/include/mach/ohci.h
rename to include/linux/platform_data/usb-ohci-pxa27x.h
include/linux/platform_data/usb-pxa3xx-ulpi.h renamed from arch/arm/mach-pxa/include/mach/pxa3xx-u2d.h +0 -0
similarity index 100%
rename from arch/arm/mach-pxa/include/mach/pxa3xx-u2d.h
rename to include/linux/platform_data/usb-pxa3xx-ulpi.h
include/linux/platform_data/video-pxafb.h renamed from arch/arm/mach-pxa/include/mach/pxafb.h +0 -0
similarity index 100%
rename from arch/arm/mach-pxa/include/mach/pxafb.h
rename to include/linux/platform_data/video-pxafb.h
sound/soc/pxa/palm27x.c +1 -1
index db24bc6..aa3da91 100644
@@ -25,7 +25,7 @@
 
 #include <asm/mach-types.h>
 #include <mach/audio.h>
-#include <mach/palmasoc.h>
+#include <linux/platform_data/asoc-palm27x.h>
 
 #include "../codecs/wm9712.h"
 #include "pxa2xx-ac97.h"
Signature · 1 line
1.7.10
#26 lore raw

PATCH 7/16 ARM: pxa: move platform_data definitions

Quoted 7 lines · Arnd Bergmann

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

This moves such data out of the pxa include directories

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

[...]

Quoted 7 lines
 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/em-x270.c                            |   10 +++++-----
 arch/arm/mach-pxa/pxa3xx-ulpi.c                        |    2 +-
 .../linux/platform_data/usb-pxa3xx-ulpi.h              |    0
 rename arch/arm/mach-pxa/include/mach/pxa3xx-u2d.h => include/linux/platform_data/usb-pxa3xx-ulpi.h (100%)
Acked-by Igor Grinberg <[email protected]>
Signature · 2 lines
Regards,
Igor.
#27 lore raw

PATCH 7/16 ARM: pxa: move platform_data definitions

In reply to Arnd Bergmann
Quoted 29 lines · Arnd Bergmann

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

This moves such data out of the pxa include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Eric Miao <[email protected]>
Cc Haojian Zhuang <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Daniel Ribeiro <[email protected]>
Cc Stefan Schmidt <[email protected]>
Cc Harald Welte <[email protected]>
Cc Philipp Zabel <[email protected]>
Cc Paul Parsons <[email protected]>
Cc Robert Jarzmik <[email protected]>
Cc Tomas Cech <[email protected]>
Cc Sergey Lapin <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Jeff Garzik <[email protected]>
Cc Vinod Koul <[email protected]>
Cc Dan Williams <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Chris Ball <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Samuel Ortiz <[email protected]>
Cc Alan Stern <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Quoted 8 lines
Cc Florian Tobias Schandinat <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
Cc Guennadi Liakhovetski <[email protected]>
Cc Artem Bityutskiy <[email protected]>
Cc openezx-devel at lists.openezx.org
Acked-by Jeff Garzik <[email protected]>
#28 lore raw

PATCH 7/16 ARM: pxa: move platform_data definitions

In reply to Arnd Bergmann

Dear Arnd Bergmann,

Quoted 7 lines

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

This moves such data out of the pxa include directories

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

[...]

Nice list ;-)

For the Palm part, Balloon3 part, Colibri part, Vpac part, Z2 part:

Acked-by Marek Vasut <[email protected]>

Best regards,
Marek Vasut

maintainer
#29 lore raw

PATCH 7/16 ARM: pxa: move platform_data definitions

In reply to Arnd Bergmann
Quoted 5 lines · Arnd Bergmann

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

This moves such data out of the pxa include directories

Acked-by Robert Jarzmik <[email protected]>
Signature · 1 line
Robert
#30 lore raw

PATCH 7/16 ARM: pxa: move platform_data definitions

In reply to Arnd Bergmann
Quoted 5 lines · Arnd Bergmann

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

This moves such data out of the pxa include directories

For arch/arm/mach-pxa/hx4700.c:

Acked-by Paul Parsons <[email protected]>
#31 lore raw

PATCH 7/16 ARM: pxa: move platform_data definitions

In reply to Arnd Bergmann

Hello.

Quoted 7 lines

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

This moves such data out of the pxa include directories

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

[...]

Quoted 1 line
 arch/arm/mach-pxa/ezx.c                                |    8 ++++----
Acked-by Stefan Schmidt <[email protected]>

regards
Stefan Schmidt

#32 lore raw

PATCH 1/1 ARM: pxa: Fix build error caused by sram.h rename

In reply to Arnd Bergmann

Commit 293b2da1b61 ("ARM: pxa: move platform_data definitions") renamed arch/arm/mach-mmp/include/mach/sram.h to include/linux/platform_data/dma-mmp_tdma.h, but didn't update mmp-pcm.c which uses the header. Fix the build error.

Signed-off-by Chris Ball <[email protected]>
---
 sound/soc/pxa/mmp-pcm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/pxa/mmp-pcm.c +1 -1
index 73ac546..e834faf 100644
@@ -15,13 +15,13 @@
 #include <linux/slab.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
+#include <linux/platform_data/dma-mmp_tdma.h>
 #include <linux/platform_data/mmp_audio.h>
 #include <sound/pxa2xx-lib.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <mach/sram.h>
 #include <sound/dmaengine_pcm.h>
 
 struct mmp_dma_data {
Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child
author
#33 lore raw

PATCH 1/1 ARM: pxa: Fix build error caused by sram.h rename

Quoted 19 lines · Chris Ball

Commit 293b2da1b61 ("ARM: pxa: move platform_data definitions") renamed arch/arm/mach-mmp/include/mach/sram.h to include/linux/platform_data/dma-mmp_tdma.h, but didn't update mmp-pcm.c which uses the header. Fix the build error.

Signed-off-by Chris Ball <[email protected]>
---
 sound/soc/pxa/mmp-pcm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/pxa/mmp-pcm.c +1 -0
index 73ac546..e834faf 100644
@@ -15,13 +15,13 @@
 #include <linux/slab.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
+#include <linux/platform_data/dma-mmp_tdma.h>

sound/soc/pxa/mmp-pcm.c line 27

Quoted 10 lines
sound/soc/pxa/mmp-pcm.c +0 -1
 #include <linux/platform_data/mmp_audio.h>
 #include <sound/pxa2xx-lib.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <mach/sram.h>
 #include <sound/dmaengine_pcm.h>
 
 struct mmp_dma_data {
Acked-by Arnd Bergmann <[email protected]>

Sorry I didn't catch this earlier. The file was only recently added and somehow didn't appear in my build tests.

#34 lore raw

PATCH 1/1 ARM: pxa: Fix build error caused by sram.h rename

Hi Arnd,

Quoted 11 lines · Arnd Bergmann
Quoted 9 lines · Chris Ball

Commit 293b2da1b61 ("ARM: pxa: move platform_data definitions") renamed arch/arm/mach-mmp/include/mach/sram.h to include/linux/platform_data/dma-mmp_tdma.h, but didn't update mmp-pcm.c which uses the header. Fix the build error.

Signed-off-by Chris Ball <[email protected]>
---
 sound/soc/pxa/mmp-pcm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 4 lines
Acked-by Arnd Bergmann <[email protected]>

Sorry I didn't catch this earlier. The file was only recently added and somehow didn't appear in my build tests.

Thanks. Do you want to send this to mainline, or should Mark do it?

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child
author
#35 lore raw

PATCH 1/1 ARM: pxa: Fix build error caused by sram.h rename

Quoted 12 lines · Chris Ball
Quoted 11 lines · Arnd Bergmann
Quoted 9 lines · Chris Ball

Commit 293b2da1b61 ("ARM: pxa: move platform_data definitions") renamed arch/arm/mach-mmp/include/mach/sram.h to include/linux/platform_data/dma-mmp_tdma.h, but didn't update mmp-pcm.c which uses the header. Fix the build error.

Signed-off-by Chris Ball <[email protected]>
---
 sound/soc/pxa/mmp-pcm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 7 lines
Quoted 4 lines
Acked-by Arnd Bergmann <[email protected]>

Sorry I didn't catch this earlier. The file was only recently added and somehow didn't appear in my build tests.

Thanks. Do you want to send this to mainline, or should Mark do it?

I think it's better for Mark to queue it up than me. sound/soc/ is his domain, and I don't have any other patches that would go along with this fix.

Arnd

#36 lore raw

PATCH 1/1 ARM: pxa: Fix build error caused by sram.h rename

Quoted 7 lines · Arnd Bergmann
Quoted 1 line · Chris Ball

Thanks. Do you want to send this to mainline, or should Mark do it?

I think it's better for Mark to queue it up than me. sound/soc/ is his domain, and I don't have any other patches that would go along with this fix.

Can someone send me the patch please (possibly with a slightly smaller CC list)?

author
#37 lore raw

PATCH 8/16 ARM: sa1100: move platform_data definitions

In reply to Arnd Bergmann

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

This moves such data out of the sa1100 include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Samuel Ortiz <[email protected]>
Cc Jochen Friedrich <[email protected]>
---
 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%)
arch/arm/mach-sa1100/assabet.c +1 -1
index d673211..ba49241 100644
@@ -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"
arch/arm/mach-sa1100/cerf.c +1 -1
index 09d7f4b..985d0b5 100644
@@ -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"
arch/arm/mach-sa1100/collie.c +1 -1
index ea5cff3..170cb61 100644
@@ -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"
arch/arm/mach-sa1100/lart.c +1 -1
index b775a0a..7dc1a89 100644
@@ -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"
arch/arm/mach-sa1100/shannon.c +1 -1
index 5d33fc3..ff6b7b3 100644
@@ -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>
arch/arm/mach-sa1100/simpad.c +1 -1
index fbd5359..c73e1a3 100644
@@ -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>
drivers/mfd/mcp-sa11x0.c +1 -1
index c54e244..f99d629 100644
@@ -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"
include/linux/platform_data/mfd-mcp-sa11x0.h renamed from arch/arm/mach-sa1100/include/mach/mcp.h +0 -0
similarity index 100%
rename from arch/arm/mach-sa1100/include/mach/mcp.h
rename to include/linux/platform_data/mfd-mcp-sa11x0.h
Signature · 1 line
1.7.10
author
#38 lore raw

PATCH 9/16 ARM: tegra: move platform_data definitions

In reply to Arnd Bergmann

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

This moves such data out of the tegra include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Colin Cross <[email protected]>
Cc Olof Johansson <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Chris Ball <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc linux-tegra at 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%)
arch/arm/mach-tegra/board-harmony.c +2 -2
index e65e837..31b3b72 100644
@@ -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"
arch/arm/mach-tegra/board-paz00.c +1 -1
index 4b64af5..6dd6854 100644
@@ -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"
arch/arm/mach-tegra/board-trimslice.c +1 -1
index 776aa95..fb80c8f 100644
@@ -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"
drivers/input/keyboard/tegra-kbc.c +1 -1
index 2c1c9ed..40aded8 100644
@@ -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
drivers/mmc/host/sdhci-tegra.c +1 -1
index 0810ccc..d43e746 100644
@@ -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"
include/linux/platform_data/asoc-tegra_wm8903.h renamed from arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h +0 -0
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
include/linux/platform_data/keyboard-tegra-kbc.h renamed from arch/arm/mach-tegra/include/mach/kbc.h +0 -0
similarity index 100%
rename from arch/arm/mach-tegra/include/mach/kbc.h
rename to include/linux/platform_data/keyboard-tegra-kbc.h
include/linux/platform_data/mmc-sdhci-tegra.h renamed from arch/arm/mach-tegra/include/mach/sdhci.h +0 -0
similarity index 100%
rename from arch/arm/mach-tegra/include/mach/sdhci.h
rename to include/linux/platform_data/mmc-sdhci-tegra.h
sound/soc/tegra/tegra_wm8903.c +1 -1
index d4f14e4..8deedf5 100644
@@ -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>
Signature · 1 line
1.7.10
Acked-by on v1 9/16
#39 lore raw

Re: [PATCH 09/16] ARM: tegra: move platform_data definitions

Quoted 5 lines · Arnd Bergmann

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

This moves such data out of the tegra include directories

I have already submitted patches for some of these:

Quoted 1 line
 .../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.

Quoted 1 line
 .../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.

Quoted 1 line
 .../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 <[email protected]>
author Acked-by Mark Brown Acked-by Greg Kroah-Hartman Acked-by Nicolas Pitre Acked-by Stephen Warren Acked-by Chris Ball
#40 lore raw

Re: [PATCH 09/16] ARM: tegra: move platform_data definitions

Quoted 9 lines · Stephen Warren
Quoted 1 line
 .../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 <[email protected]>

I've redone my patch now, the version below is what I have now.

Thanks,

Arnd

Quoted 1 line

From 1580b8b9c820db3d1e9ffce91fc741516ad5547a Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
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 <[email protected]>
Acked-by Mark Brown <[email protected]>
Acked-by Greg Kroah-Hartman <[email protected]>
Acked-by Nicolas Pitre <[email protected]>
Acked-by Stephen Warren <[email protected]>
Acked-by Chris Ball <[email protected]>
arch/arm/mach-tegra/board-harmony.c +1 -1
index e65e837..5f428ff 100644
@@ -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"
arch/arm/mach-tegra/board-paz00.c +1 -1
index 4b64af5..112bf68 100644
@@ -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"
arch/arm/mach-tegra/board-trimslice.c +1 -1
index 776aa95..8d1a66a 100644
@@ -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"
drivers/mmc/host/sdhci-tegra.c +1 -1
index 0810ccc..d43e746 100644
@@ -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"
include/linux/platform_data/mmc-sdhci-tegra.h renamed from arch/arm/mach-tegra/include/mach/sdhci.h +2 -4
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
@@ -1,6 +1,4 @@
 /*
- * include/asm-arm/arch-tegra/include/mach/sdhci.h
- *
  * Copyright (C) 2009 Palm, Inc.
  * Author: Yvonne Yip <[email protected]>
  *

@@ -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>
#41 lore raw

Re: [PATCH 09/16] ARM: tegra: move platform_data definitions

Quoted 10 lines · Arnd Bergmann
Quoted 8 lines · Stephen Warren
Quoted 1 line
 .../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:

Quoted 3 lines
Quoted 1 line
Acked-by Stephen Warren <[email protected]>

I've redone my patch now, the version below is what I have now.

OK, that looks fine.

#42 lore raw

Re: [PATCH 09/16] ARM: tegra: move platform_data definitions

In reply to Arnd Bergmann

Hi Arnd,

include/linux/platform_data/mmc-sdhci-tegra.h

Quoted 5 lines · Arnd Bergmann
include/linux/platform_data/mmc-sdhci-tegra.h renamed from arch/arm/mach-tegra/include/mach/sdhci.h +0 -0
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.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child
author
#43 lore raw

Re: [PATCH 09/16] ARM: tegra: move platform_data definitions

Quoted 10 lines · Chris Ball

include/linux/platform_data/mmc-sdhci-tegra.h

Quoted 5 lines · Arnd Bergmann
include/linux/platform_data/mmc-sdhci-tegra.h renamed from arch/arm/mach-tegra/include/mach/sdhci.h +0 -0
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:

Quoted 5 lines

#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

#44 lore raw

Re: [PATCH 09/16] ARM: tegra: move platform_data definitions

Hi,

Quoted 10 lines · Arnd Bergmann
Quoted 7 lines

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.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child
#45 lore raw

RE: [PATCH 09/16] ARM: tegra: move platform_data definitions

In reply to Arnd Bergmann

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: [email protected] [mailto:linux-arm-kernel-bounces at 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 at vger.kernel.org; linux-tegra at vger.kernel.org; Colin Cross; Olof Johansson; Liam Girdwood; linux-arm-kernel at lists.infradead.org
Subject: Re: [PATCH 09/16] ARM: tegra: move platform_data definitions

Quoted 10 lines · Chris Ball

include/linux/platform_data/mmc-sdhci-tegra.h

Quoted 5 lines · Arnd Bergmann
include/linux/platform_data/mmc-sdhci-tegra.h renamed from arch/arm/mach-tegra/include/mach/sdhci.h +0 -0
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:

Quoted 5 lines

#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 at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

author
#46 lore raw

PATCH 10/16 ARM: vt8500: move platform_data definitions

In reply to Arnd Bergmann

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

This moves such data out of the vt8500 include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Tony Prisk <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
---
 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%)
arch/arm/mach-vt8500/devices.c +1 -1
index 1fcdc36..82b4bce 100644
@@ -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"
drivers/video/vt8500lcdfb.c +1 -1
index 2a5fe6e..66a74f9 100644
@@ -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"
drivers/video/wm8505fb.c +1 -1
index c8703bd..ffeff48 100644
@@ -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"
include/linux/platform_data/video-vt8500lcdfb.h renamed from arch/arm/mach-vt8500/include/mach/vt8500fb.h +0 -0
similarity index 100%
rename from arch/arm/mach-vt8500/include/mach/vt8500fb.h
rename to include/linux/platform_data/video-vt8500lcdfb.h
Signature · 1 line
1.7.10
Acked-by on v1 10/16
#47 lore raw

Re: [PATCH 10/16] ARM: vt8500: move platform_data definitions

include/linux/platform_data/video-vt8500lcdfb.h

Quoted 60 lines · Arnd Bergmann

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

This moves such data out of the vt8500 include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Tony Prisk <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
---
 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%)
arch/arm/mach-vt8500/devices.c +1 -1
index 1fcdc36..82b4bce 100644
@@ -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"
drivers/video/vt8500lcdfb.c +1 -1
index 2a5fe6e..66a74f9 100644
@@ -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"
drivers/video/wm8505fb.c +1 -1
index c8703bd..ffeff48 100644
@@ -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"
include/linux/platform_data/video-vt8500lcdfb.h renamed from arch/arm/mach-vt8500/include/mach/vt8500fb.h +0 -0
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 <[email protected]>

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.

author
#48 lore raw

PATCH 11/16 ARM: w90x900: move platform_data definitions

In reply to Arnd Bergmann

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

This moves such data out of the w90x900 include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Wan ZongShun <[email protected]>
Cc "Ben Dooks (embedded platforms)" <[email protected]>
Cc "Wolfram Sang (embedded platforms)" <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Grant Likely <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
Cc Mark Brown <[email protected]>
---
 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%)
arch/arm/mach-w90x900/dev.c +3 -3
index 48f5b9f..7abdb96 100644
@@ -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"
arch/arm/mach-w90x900/mach-nuc950evb.c +1 -1
index 067d8f9..500fe59 100644
@@ -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"
drivers/i2c/busses/i2c-nuc900.c +1 -1
index a26dfb8..f41502e 100644
@@ -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 */
drivers/input/keyboard/w90p910_keypad.c +1 -1
index 085ede4..e0f6cd1 100644
@@ -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
drivers/spi/spi-nuc900.c +1 -1
index dae8be2..a6eca6f 100644
@@ -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
drivers/video/nuc900fb.c +1 -1
index e10f551..9338755 100644
@@ -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"
drivers/video/nuc900fb.h +1 -1
index bc7c930..9a1ca6d 100644
@@ -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,
include/linux/platform_data/i2c-nuc900.h renamed from arch/arm/mach-w90x900/include/mach/i2c.h +0 -0
similarity index 100%
rename from arch/arm/mach-w90x900/include/mach/i2c.h
rename to include/linux/platform_data/i2c-nuc900.h
include/linux/platform_data/keypad-w90p910.h renamed from arch/arm/mach-w90x900/include/mach/w90p910_keypad.h +0 -0
similarity index 100%
rename from arch/arm/mach-w90x900/include/mach/w90p910_keypad.h
rename to include/linux/platform_data/keypad-w90p910.h
include/linux/platform_data/spi-nuc900.h renamed from arch/arm/mach-w90x900/include/mach/nuc900_spi.h +0 -0
similarity index 100%
rename from arch/arm/mach-w90x900/include/mach/nuc900_spi.h
rename to include/linux/platform_data/spi-nuc900.h
include/linux/platform_data/video-nuc900fb.h renamed from arch/arm/mach-w90x900/include/mach/fb.h +0 -0
similarity index 100%
rename from arch/arm/mach-w90x900/include/mach/fb.h
rename to include/linux/platform_data/video-nuc900fb.h
Signature · 1 line
1.7.10
author
#49 lore raw

PATCH 12/16 ARM: nomadik: move platform_data definitions

In reply to Arnd Bergmann

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

This moves such data out of the nomadik include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Alessandro Rubini <[email protected]>
Cc Linus Walleij <[email protected]>
Cc STEricsson <[email protected]>
Cc Srinidhi Kasagar <[email protected]>
Cc Herbert Xu <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Andreas Westin <[email protected]>
---
 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%)
arch/arm/mach-nomadik/board-nhk8815.c +1 -1
index f4535a7..381c080 100644
@@ -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"
arch/arm/mach-u300/core.c +1 -1
index 03acf18..62adfe7 100644
@@ -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"
arch/arm/mach-ux500/board-mop500.c +1 -1
index 8674a89..38854d4 100644
@@ -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"
arch/arm/mach-ux500/cpu-db8500.c +1 -1
index db3c52d..1bef4c3 100644
@@ -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"
arch/arm/mach-ux500/devices-common.h +1 -1
index ecdd838..7fbf0ba 100644
@@ -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;
arch/arm/mach-ux500/usb.c +1 -1
index a74af38..145482e 100644
@@ -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, \
drivers/crypto/ux500/cryp/cryp_core.c +1 -1
index 1c307e1..ef17e38 100644
@@ -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"
drivers/crypto/ux500/hash/hash_core.c +1 -1
index 08d5032..0876507 100644
@@ -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"
drivers/input/keyboard/nomadik-ske-keypad.c +1 -1
index a880e74..49f5fa6 100644
@@ -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)
drivers/mtd/nand/nomadik_nand.c +1 -1
index a86aa81..9ee0c4e 100644
@@ -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>
drivers/pinctrl/pinctrl-coh901.c +1 -1
index cc0f00d..b7f41e9 100644
@@ -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"
 
 /*
drivers/usb/musb/ux500_dma.c +1 -1
index d05c7fb..f82246d 100644
@@ -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 {
include/linux/platform_data/crypto-ux500.h renamed from arch/arm/mach-ux500/include/mach/crypto-ux500.h +0 -0
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/crypto-ux500.h
rename to include/linux/platform_data/crypto-ux500.h
include/linux/platform_data/keypad-nomadik-ske.h renamed from arch/arm/plat-nomadik/include/plat/ske.h +0 -0
similarity index 100%
rename from arch/arm/plat-nomadik/include/plat/ske.h
rename to include/linux/platform_data/keypad-nomadik-ske.h
include/linux/platform_data/mtd-nomadik-nand.h renamed from arch/arm/mach-nomadik/include/mach/nand.h +0 -0
similarity index 100%
rename from arch/arm/mach-nomadik/include/mach/nand.h
rename to include/linux/platform_data/mtd-nomadik-nand.h
include/linux/platform_data/pinctrl-coh901.h renamed from arch/arm/mach-u300/include/mach/gpio-u300.h +0 -0
similarity index 100%
rename from arch/arm/mach-u300/include/mach/gpio-u300.h
rename to include/linux/platform_data/pinctrl-coh901.h
include/linux/platform_data/usb-musb-ux500.h renamed from arch/arm/mach-ux500/include/mach/usb.h +0 -0
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/usb.h
rename to include/linux/platform_data/usb-musb-ux500.h
Signature · 1 line
1.7.10
Acked-by on v1 12/16
#50 lore raw

Re: [PATCH 12/16] ARM: nomadik: move platform_data definitions

Quoted 6 lines · Arnd Bergmann

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

This moves such data out of the nomadik include directories

Quoted 12 lines
Signed-off-by Arnd Bergmann <[email protected]>
Cc Alessandro Rubini <[email protected]>
Cc Linus Walleij <[email protected]>
Cc STEricsson <[email protected]>
Cc Srinidhi Kasagar <[email protected]>
Cc Herbert Xu <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Andreas Westin <[email protected]>

for musb:

Acked-by Felipe Balbi <[email protected]>
Quoted 204 lines
---
 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%)
arch/arm/mach-nomadik/board-nhk8815.c +1 -1
index f4535a7..381c080 100644
@@ -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"
arch/arm/mach-u300/core.c +1 -1
index 03acf18..62adfe7 100644
@@ -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"
arch/arm/mach-ux500/board-mop500.c +1 -1
index 8674a89..38854d4 100644
@@ -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"
arch/arm/mach-ux500/cpu-db8500.c +1 -1
index db3c52d..1bef4c3 100644
@@ -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"
arch/arm/mach-ux500/devices-common.h +1 -1
index ecdd838..7fbf0ba 100644
@@ -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;
arch/arm/mach-ux500/usb.c +1 -1
index a74af38..145482e 100644
@@ -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, \
drivers/crypto/ux500/cryp/cryp_core.c +1 -1
index 1c307e1..ef17e38 100644
@@ -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"
drivers/crypto/ux500/hash/hash_core.c +1 -1
index 08d5032..0876507 100644
@@ -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"
drivers/input/keyboard/nomadik-ske-keypad.c +1 -1
index a880e74..49f5fa6 100644
@@ -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)
drivers/mtd/nand/nomadik_nand.c +1 -1
index a86aa81..9ee0c4e 100644
@@ -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>
drivers/pinctrl/pinctrl-coh901.c +1 -1
index cc0f00d..b7f41e9 100644
@@ -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"
 
 /*
drivers/usb/musb/ux500_dma.c +1 -1
index d05c7fb..f82246d 100644
@@ -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 {
include/linux/platform_data/crypto-ux500.h renamed from arch/arm/mach-ux500/include/mach/crypto-ux500.h +0 -0
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/crypto-ux500.h
rename to include/linux/platform_data/crypto-ux500.h
include/linux/platform_data/keypad-nomadik-ske.h renamed from arch/arm/plat-nomadik/include/plat/ske.h +0 -0
similarity index 100%
rename from arch/arm/plat-nomadik/include/plat/ske.h
rename to include/linux/platform_data/keypad-nomadik-ske.h
include/linux/platform_data/mtd-nomadik-nand.h renamed from arch/arm/mach-nomadik/include/mach/nand.h +0 -0
similarity index 100%
rename from arch/arm/mach-nomadik/include/mach/nand.h
rename to include/linux/platform_data/mtd-nomadik-nand.h
include/linux/platform_data/pinctrl-coh901.h renamed from arch/arm/mach-u300/include/mach/gpio-u300.h +0 -0
similarity index 100%
rename from arch/arm/mach-u300/include/mach/gpio-u300.h
rename to include/linux/platform_data/pinctrl-coh901.h
include/linux/platform_data/usb-musb-ux500.h renamed from arch/arm/mach-ux500/include/mach/usb.h +0 -0
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/usb.h
rename to include/linux/platform_data/usb-musb-ux500.h
Signature · 1 line
1.7.10
Signature · 8 lines
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120911/0c9cc4b9/attachment.sig>
#51 lore raw

Re: [PATCH 12/16] ARM: nomadik: move platform_data definitions

In reply to Arnd Bergmann
Quoted 8 lines · Arnd Bergmann
 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 +-
Quoted 8 lines
 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?

Quoted 7 lines
 .../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 <[email protected]>

Yours,
Linus Walleij

author
#52 lore raw

Re: [PATCH 12/16] ARM: nomadik: move platform_data definitions

Quoted 19 lines · Linus Walleij
Quoted 8 lines · Arnd Bergmann
 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 +-
Quoted 8 lines
 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
Quoted 4 lines

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

author Acked-by Mark Brown Acked-by Greg Kroah-Hartman Acked-by Nicolas Pitre Acked-by Felipe Balbi Acked-by Alessandro Rubini Acked-by Linus Walleij
#53 lore raw

Re: [PATCH 12/16] ARM: nomadik: move platform_data definitions

In reply to Linus Walleij
Quoted 4 lines · Linus Walleij

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

Quoted 1 line

From bb95f134f891ff75c5eabf740f93d11ff0ea5eca Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
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 <[email protected]>
Acked-by Mark Brown <[email protected]>
Acked-by Greg Kroah-Hartman <[email protected]>
Acked-by Nicolas Pitre <[email protected]>
Acked-by Felipe Balbi <[email protected]>
Acked-by Alessandro Rubini <[email protected]>
Acked-by Linus Walleij <[email protected]>
Cc STEricsson <[email protected]>
Cc Srinidhi Kasagar <[email protected]>
Cc Herbert Xu <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Andreas Westin <[email protected]>
---
 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%)
arch/arm/mach-nomadik/board-nhk8815.c +1 -1
index f4535a7..381c080 100644
@@ -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"
arch/arm/mach-ux500/board-mop500.c +1 -1
index 8674a89..38854d4 100644
@@ -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"
arch/arm/mach-ux500/cpu-db8500.c +1 -1
index db3c52d..1bef4c3 100644
@@ -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"
arch/arm/mach-ux500/devices-common.h +1 -1
index ecdd838..7fbf0ba 100644
@@ -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;
arch/arm/mach-ux500/usb.c +1 -1
index a74af38..145482e 100644
@@ -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, \
drivers/crypto/ux500/cryp/cryp_core.c +1 -1
index 1c307e1..ef17e38 100644
@@ -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"
drivers/crypto/ux500/hash/hash_core.c +1 -1
index 08d5032..0876507 100644
@@ -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"
drivers/input/keyboard/nomadik-ske-keypad.c +1 -1
index a880e74..49f5fa6 100644
@@ -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)
drivers/mtd/nand/nomadik_nand.c +1 -1
index a86aa81..9ee0c4e 100644
@@ -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>
drivers/usb/musb/ux500_dma.c +1 -1
index d05c7fb..f82246d 100644
@@ -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 {
include/linux/platform_data/crypto-ux500.h renamed from arch/arm/mach-ux500/include/mach/crypto-ux500.h +0 -0
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/crypto-ux500.h
rename to include/linux/platform_data/crypto-ux500.h
include/linux/platform_data/keypad-nomadik-ske.h renamed from arch/arm/plat-nomadik/include/plat/ske.h +0 -0
similarity index 100%
rename from arch/arm/plat-nomadik/include/plat/ske.h
rename to include/linux/platform_data/keypad-nomadik-ske.h
include/linux/platform_data/mtd-nomadik-nand.h renamed from arch/arm/mach-nomadik/include/mach/nand.h +0 -0
similarity index 100%
rename from arch/arm/mach-nomadik/include/mach/nand.h
rename to include/linux/platform_data/mtd-nomadik-nand.h
include/linux/platform_data/usb-musb-ux500.h renamed from arch/arm/mach-ux500/include/mach/usb.h +0 -0
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/usb.h
rename to include/linux/platform_data/usb-musb-ux500.h
Signature · 1 line
1.7.10
author
#55 lore raw

PATCH 13/16 ARM: omap: move platform_data definitions

In reply to Arnd Bergmann

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

This moves such data out of the omap include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc "Beno?t Cousson" <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Ohad Ben-Cohen <[email protected]>
Cc Grant Likely <[email protected]>
Cc Omar Ramirez Luna <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Tomi Valkeinen <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
Cc Peter Ujfalusi <[email protected]>
Cc Jarkko Nikula <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc Artem Bityutskiy <[email protected]>
Cc Jean Pihet <[email protected]>
Cc J Keerthy <[email protected]>
Cc linux-omap at 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%)
arch/arm/mach-omap1/board-ams-delta.c +1 -1
index c534698..b9df845 100644
@@ -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>
arch/arm/mach-omap1/board-fsample.c +1 -1
index 6872f3f..e8f772b 100644
@@ -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>
arch/arm/mach-omap1/board-h2.c +1 -1
index 44a4ab1..f59aa80 100644
@@ -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>
arch/arm/mach-omap1/board-h3.c +1 -1
index 86cb5a0..e20af3f 100644
@@ -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>
arch/arm/mach-omap1/board-htcherald.c +1 -1
index b3f6e94..20ec5a8 100644
@@ -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>
arch/arm/mach-omap1/board-innovator.c +1 -1
index f21c296..083afa7 100644
@@ -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>
arch/arm/mach-omap1/board-nokia770.c +2 -2
index 2c0ca8f..657bf7c 100644
@@ -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>
arch/arm/mach-omap1/board-osk.c +1 -1
index 8784705..1c42a96 100644
@@ -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,
arch/arm/mach-omap1/board-palmte.c +1 -1
index 26bcb9d..ed1cd69 100644
@@ -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>
arch/arm/mach-omap1/board-palmtt.c +1 -1
index 4d09944..f4b9458 100644
@@ -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>
arch/arm/mach-omap1/board-palmz71.c +1 -1
index 3559803..fb08004 100644
@@ -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>
arch/arm/mach-omap1/board-perseus2.c +1 -1
index 703d55e..f5e2c00 100644
@@ -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>
arch/arm/mach-omap1/board-sx1.c +1 -1
index 8c665bd..51325a9 100644
@@ -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>
arch/arm/mach-omap1/mcbsp.c +1 -1
index adf0097..b1a5b47 100644
@@ -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>
arch/arm/mach-omap2/board-3430sdp.c +1 -1
index a98c688..76d03d3 100644
@@ -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"
arch/arm/mach-omap2/board-cm-t35.c +2 -2
index 97d7190..3f844f4 100644
@@ -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>
arch/arm/mach-omap2/board-cm-t3517.c +1 -1
index a33ad46..e1811ba 100644
@@ -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>
arch/arm/mach-omap2/board-devkit8000.c +2 -2
index 6567c1c..e4456c2 100644
@@ -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>
arch/arm/mach-omap2/board-flash.c +2 -2
index 53c39d2..a1ef5f0 100644
@@ -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"
arch/arm/mach-omap2/board-igep0020.c +1 -1
index 7491529..4e5de5a 100644
@@ -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"
arch/arm/mach-omap2/board-ldp.c +1 -1
index ef9e829..b5ba08b 100644
@@ -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>
arch/arm/mach-omap2/board-n8x0.c +2 -2
index 677357f..a60c575 100644
@@ -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>
arch/arm/mach-omap2/board-omap3beagle.c +1 -1
index 6202fc7..b483d49 100644
@@ -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>
arch/arm/mach-omap2/board-omap3evm.c +2 -2
index ef230a0..89db942 100644
@@ -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>
arch/arm/mach-omap2/board-omap3pandora.c +2 -2
index 57aebee..44ca395 100644
@@ -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"
arch/arm/mach-omap2/board-omap3stalker.c +2 -2
index b318f56..e967363 100644
@@ -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>
arch/arm/mach-omap2/board-omap3touchbook.c +2 -2
index 485d14d..7b4a604 100644
@@ -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"
arch/arm/mach-omap2/board-overo.c +2 -2
index 779734d..db964e6 100644
@@ -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>
arch/arm/mach-omap2/board-rm680.c +1 -1
index 0ad1bb3b..bbfbe56 100644
@@ -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"
arch/arm/mach-omap2/board-rx51-peripherals.c +2 -2
index df2534d..9bfbb61 100644
@@ -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>
arch/arm/mach-omap2/board-rx51-video.c +1 -1
index 2c1289b..7ef0994 100644
@@ -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>
arch/arm/mach-omap2/board-rx51.c +1 -1
index 345dd93..779c67e 100644
@@ -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>
arch/arm/mach-omap2/board-zoom-display.c +1 -1
index 28187f1..660a2932 100644
@@ -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>
arch/arm/mach-omap2/common-board-devices.c +2 -2
index 1473474..eedb6d0 100644
@@ -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"
arch/arm/mach-omap2/devices.c +1 -1
index c00c689..bd1b907 100644
@@ -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)
 {
arch/arm/mach-omap2/dsp.c +1 -1
index a636ebc..9838810 100644
@@ -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;
arch/arm/mach-omap2/gpmc-nand.c +1 -1
index 386dec8..af6f177 100644
@@ -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>
arch/arm/mach-omap2/gpmc-onenand.c +1 -1
index a0fa9bb..d27b02d 100644
@@ -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>
arch/arm/mach-omap2/mcbsp.c +1 -1
index 577cb77..4ee08c6 100644
@@ -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>
arch/arm/mach-omap2/omap_hwmod_2420_data.c +1 -1
index 50cfab6..558c300 100644
@@ -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>
arch/arm/mach-omap2/omap_hwmod_2430_data.c +2 -2
index 58b5bc1..d662766 100644
@@ -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>
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +1 -1
index afad69c..161ae0a 100644
@@ -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>
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +2 -2
index c9e3820..656bb7f 100644
@@ -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"
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +2 -2
index 242aee4..3a06e7d 100644
@@ -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>
arch/arm/mach-omap2/voltage.h +1 -1
index 0ac2caf..7abf1c0 100644
@@ -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"
arch/arm/plat-omap/common.c +1 -1
index 89a3723..f18b73b 100644
@@ -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>
drivers/input/keyboard/omap-keypad.c +1 -1
index a0222db..8aaa326 100644
@@ -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>
drivers/mtd/nand/omap2.c +1 -1
index ac4fd75..5efaac6 100644
@@ -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
drivers/mtd/onenand/omap2.c +1 -1
index 398a827..f9017b3 100644
@@ -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>
drivers/remoteproc/omap_remoteproc.c +1 -1
index a1f7ac1..b54504e 100644
@@ -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"
drivers/spi/spi-omap2-mcspi.c +1 -1
index b2fb141..b9b7ad0 100644
@@ -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
drivers/staging/tidspbridge/core/dsp-clock.c +1 -1
index c7df34e..346fa559 100644
@@ -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>
drivers/staging/tidspbridge/core/tiomap3430.c +1 -1
index f9609ce..7bf55c4 100644
@@ -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 */
drivers/staging/tidspbridge/core/tiomap3430_pwr.c +1 -1
index 16a4aaf..55675b7 100644
@@ -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>
drivers/staging/tidspbridge/core/tiomap_io.c +1 -1
index 7fda10c..f53ed98 100644
@@ -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>
drivers/staging/tidspbridge/rmgr/drv_interface.c +1 -1
index 3cac014..49c9b66 100644
@@ -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>
drivers/video/omap/lcd_mipid.c +1 -1
index e3880c4..b739600 100644
@@ -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"
include/linux/platform_data/dsp-mcbsp.h renamed from arch/arm/plat-omap/include/plat/mcbsp.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/mcbsp.h
rename to include/linux/platform_data/dsp-mcbsp.h
include/linux/platform_data/dsp-omap.h renamed from arch/arm/plat-omap/include/plat/dsp.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/dsp.h
rename to include/linux/platform_data/dsp-omap.h
include/linux/platform_data/keypad-omap.h renamed from arch/arm/plat-omap/include/plat/keypad.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/keypad.h
rename to include/linux/platform_data/keypad-omap.h
include/linux/platform_data/lcd-mipid.h renamed from arch/arm/plat-omap/include/plat/lcd_mipid.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/lcd_mipid.h
rename to include/linux/platform_data/lcd-mipid.h
include/linux/platform_data/mtd-nand-omap2.h renamed from arch/arm/plat-omap/include/plat/nand.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/nand.h
rename to include/linux/platform_data/mtd-nand-omap2.h
include/linux/platform_data/mtd-onenand-omap2.h renamed from arch/arm/plat-omap/include/plat/onenand.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/onenand.h
rename to include/linux/platform_data/mtd-onenand-omap2.h
include/linux/platform_data/remoteproc-omap.h renamed from arch/arm/plat-omap/include/plat/remoteproc.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/remoteproc.h
rename to include/linux/platform_data/remoteproc-omap.h
include/linux/platform_data/smartreflex-omap.h renamed from arch/arm/plat-omap/include/plat/voltage.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/voltage.h
rename to include/linux/platform_data/smartreflex-omap.h
include/linux/platform_data/spi-omap2-mcspi.h renamed from arch/arm/plat-omap/include/plat/mcspi.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/mcspi.h
rename to include/linux/platform_data/spi-omap2-mcspi.h
include/linux/power/smartreflex.h +1 -1
index 3101e62..e376f94 100644
@@ -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
sound/soc/omap/am3517evm.c +1 -1
index 009533a..e815c4a 100644
@@ -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"
sound/soc/omap/ams-delta.c +1 -1
index 7d4fa8e..293e61a 100644
@@ -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"
sound/soc/omap/igep0020.c +1 -1
index e835781..e6393b0 100644
@@ -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"
sound/soc/omap/mcbsp.c +1 -1
index d33c48b..4bc029d 100644
@@ -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"
sound/soc/omap/n810.c +1 -1
index abac4b6..232357b 100644
@@ -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"
sound/soc/omap/omap-mcbsp.c +1 -1
index acdd3ef..deeda47 100644
@@ -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"
sound/soc/omap/omap3beagle.c +1 -1
index 2830dfd..89d115c 100644
@@ -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"
sound/soc/omap/omap3evm.c +1 -1
index 3d468c9..50d0b70 100644
@@ -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"
sound/soc/omap/omap3pandora.c +1 -1
index 4c3a097..68c4e16 100644
@@ -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"
sound/soc/omap/osk5912.c +1 -1
index b1a9d64..27b9a05 100644
@@ -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"
sound/soc/omap/overo.c +1 -1
index 6ac3e0c..080c984 100644
@@ -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"
sound/soc/omap/rx51.c +1 -1
index 2712dd2..5b21bc4 100644
@@ -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>
sound/soc/omap/sdp3430.c +1 -1
index 0e28322..33f4ac2 100644
@@ -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>
sound/soc/omap/zoom2.c +1 -1
index 920e0d9..558364f 100644
@@ -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>
Signature · 1 line
1.7.10
#56 lore raw

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

Hi Arnd,

Quoted 78 lines · Arnd Bergmann

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

This moves such data out of the omap include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc "Benoît Cousson" <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Ohad Ben-Cohen <[email protected]>
Cc Grant Likely <[email protected]>
Cc Omar Ramirez Luna <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Tomi Valkeinen <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
Cc Peter Ujfalusi <[email protected]>
Cc Jarkko Nikula <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc Artem Bityutskiy <[email protected]>
Cc Jean Pihet <[email protected]>
Cc J Keerthy <[email protected]>
Cc [email protected]
---
 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 +-
Quoted 8 lines
 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).

Quoted 9 lines
 .../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.

Quoted 4 lines
 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

Quoted 1 line

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):

Quoted 22 lines
 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%)
Signature · 1 line
Péter
author
#57 lore raw

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

Quoted 4 lines · Peter Ujfalusi

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.

Quoted 12 lines
Quoted 9 lines
 .../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:

Quoted 8 lines

This four drivers are going to be removed via sound tree.

Quoted 4 lines
 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.

Quoted 14 lines

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):

Quoted 11 lines
 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

#58 lore raw

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

Hi Arnd,

Quoted 48 lines · Arnd Bergmann
Quoted 4 lines · Peter Ujfalusi

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.

Quoted 12 lines
Quoted 9 lines
 .../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:

Quoted 8 lines

This four drivers are going to be removed via sound tree.

Quoted 4 lines
 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.

Quoted 14 lines

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):

Quoted 11 lines
 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 +-
Quoted 6 lines

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

author
#59 lore raw

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

Quoted 6 lines · Peter Ujfalusi

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

#60 lore raw

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

In reply to Arnd Bergmann

Hi Arnd,

Quoted 7 lines · Arnd Bergmann

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

This moves such data out of the omap include directories

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

...

Quoted 13 lines
arch/arm/mach-omap2/voltage.h +1 -1
index 0ac2caf..7abf1c0 100644
@@ -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"

...

include/linux/platform_data/smartreflex-omap.h

Quoted 4 lines
include/linux/platform_data/smartreflex-omap.h renamed from arch/arm/plat-omap/include/plat/voltage.h +0 -0
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.

include/linux/power/smartreflex.h line 29

Quoted 13 lines
include/linux/power/smartreflex.h +1 -1
index 3101e62..e376f94 100644
@@ -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

author
#61 lore raw

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

Quoted 9 lines · Jean

include/linux/platform_data/smartreflex-omap.h

Quoted 4 lines
include/linux/platform_data/smartreflex-omap.h renamed from arch/arm/plat-omap/include/plat/voltage.h +0 -0
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

#62 lore raw

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

Quoted 11 lines · Arnd Bergmann
Quoted 9 lines · Jean

include/linux/platform_data/smartreflex-omap.h

Quoted 4 lines
include/linux/platform_data/smartreflex-omap.h renamed from arch/arm/plat-omap/include/plat/voltage.h +0 -0
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.

Quoted 1 line

Ok, makes sense. Changed now.

Great, thanks!

Jean

Quoted 2 lines

Arnd

#63 lore raw

Re: [PATCH 01/16] ARM: at91: move platform_data definitions

In reply to Arnd Bergmann
Quoted 39 lines · Arnd Bergmann

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

This moves such data out of the at91 include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc Jean-Christophe Plagniol-Villard <[email protected]>
Cc Vinod Koul <[email protected]>
Cc Dan Williams <[email protected]>
---
 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%)
arch/arm/mach-at91/at91sam9g45_devices.c +1 -1
index 0607399..0aa9bdb 100644
@@ -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>
arch/arm/mach-at91/at91sam9rl_devices.c +0 -0
index f09fff9..e4da717 100644

arch/arm/mach-at91/at91sam9rl_devices.c line 25

Quoted 5 lines
arch/arm/mach-at91/at91sam9rl_devices.c +1 -1
@@ -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.

Quoted 49 lines
arch/arm/mach-at91/at91sam9rl_devices.c +0 -0
 #include "generic.h"
arch/arm/mach-at91/include/mach/atmel-mci.h +1 -1
index 998cb0c..cd580a1 100644
@@ -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
drivers/dma/at_hdmac_regs.h +1 -1
index 8a6c8e8..116e4ad 100644
@@ -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
include/linux/platform_data/atmel-aes.h +1 -1
index e7a1949..ab68082 100644
@@ -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
include/linux/platform_data/dma-atmel.h renamed from arch/arm/mach-at91/include/mach/at_hdmac.h +0 -0
similarity index 100%
rename from arch/arm/mach-at91/include/mach/at_hdmac.h
rename to include/linux/platform_data/dma-atmel.h
Signature · 1 line
1.7.10
Acked-by
#64 lore raw

Re: [PATCH 01/16] ARM: at91: move platform_data definitions

On 09/11/2012 03:20 PM, Jean-Christophe PLAGNIOL-VILLARD :

Quoted 47 lines · Arnd Bergmann
Quoted 39 lines

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

This moves such data out of the at91 include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc Jean-Christophe Plagniol-Villard <[email protected]>
Cc Vinod Koul <[email protected]>
Cc Dan Williams <[email protected]>
---
 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%)
arch/arm/mach-at91/at91sam9g45_devices.c +1 -1
index 0607399..0aa9bdb 100644
@@ -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>
arch/arm/mach-at91/at91sam9rl_devices.c +0 -0
index f09fff9..e4da717 100644

arch/arm/mach-at91/at91sam9rl_devices.c line 25

Quoted 5 lines
arch/arm/mach-at91/at91sam9rl_devices.c +1 -1
@@ -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

Quoted 1 line

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

Best regards,

Quoted 50 lines
Quoted 48 lines
arch/arm/mach-at91/at91sam9rl_devices.c +0 -0
 #include "generic.h"
arch/arm/mach-at91/include/mach/atmel-mci.h +1 -1
index 998cb0c..cd580a1 100644
@@ -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
drivers/dma/at_hdmac_regs.h +1 -1
index 8a6c8e8..116e4ad 100644
@@ -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
include/linux/platform_data/atmel-aes.h +1 -1
index e7a1949..ab68082 100644
@@ -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
include/linux/platform_data/dma-atmel.h renamed from arch/arm/mach-at91/include/mach/at_hdmac.h +0 -0
similarity index 100%
rename from arch/arm/mach-at91/include/mach/at_hdmac.h
rename to include/linux/platform_data/dma-atmel.h
Signature · 1 line
1.7.10
Signature · 1 line
Nicolas Ferre
Acked-by on v1 1/16
#65 lore raw

Re: [PATCH 01/16] ARM: at91: move platform_data definitions

In reply to Arnd Bergmann
Quoted 11 lines · Arnd Bergmann

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

This moves such data out of the at91 include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc Jean-Christophe Plagniol-Villard <[email protected]>
Cc Vinod Koul <[email protected]>
Cc Dan Williams <[email protected]>
Acked-by Vinod Koul <[email protected]>
Signature · 1 line
~Vinod
author
#66 lore raw

PATCH 13/16 ARM: omap: move platform_data definitions

In reply to Arnd Bergmann

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

This moves such data out of the omap include directories

Signed-off-by Arnd Bergmann <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc "Beno?t Cousson" <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Ohad Ben-Cohen <[email protected]>
Cc Grant Likely <[email protected]>
Cc Omar Ramirez Luna <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Tomi Valkeinen <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
Cc Peter Ujfalusi <[email protected]>
Cc Jarkko Nikula <[email protected]>
Cc Liam Girdwood <[email protected]>
Cc Mark Brown <[email protected]>
Cc Artem Bityutskiy <[email protected]>
Cc Jean Pihet <[email protected]>
Cc J Keerthy <[email protected]>
Cc linux-omap at 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%)
arch/arm/mach-omap1/board-ams-delta.c +1 -1
index c534698..b9df845 100644
@@ -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>
arch/arm/mach-omap1/board-fsample.c +1 -1
index 6872f3f..e8f772b 100644
@@ -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>
arch/arm/mach-omap1/board-h2.c +1 -1
index 44a4ab1..f59aa80 100644
@@ -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>
arch/arm/mach-omap1/board-h3.c +1 -1
index 86cb5a0..e20af3f 100644
@@ -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>
arch/arm/mach-omap1/board-htcherald.c +1 -1
index b3f6e94..20ec5a8 100644
@@ -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>
arch/arm/mach-omap1/board-innovator.c +1 -1
index f21c296..083afa7 100644
@@ -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>
arch/arm/mach-omap1/board-nokia770.c +2 -2
index 2c0ca8f..657bf7c 100644
@@ -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>
arch/arm/mach-omap1/board-osk.c +1 -1
index 8784705..1c42a96 100644
@@ -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,
arch/arm/mach-omap1/board-palmte.c +1 -1
index 26bcb9d..ed1cd69 100644
@@ -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>
arch/arm/mach-omap1/board-palmtt.c +1 -1
index 4d09944..f4b9458 100644
@@ -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>
arch/arm/mach-omap1/board-palmz71.c +1 -1
index 3559803..fb08004 100644
@@ -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>
arch/arm/mach-omap1/board-perseus2.c +1 -1
index 703d55e..f5e2c00 100644
@@ -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>
arch/arm/mach-omap1/board-sx1.c +1 -1
index 8c665bd..51325a9 100644
@@ -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>
arch/arm/mach-omap1/mcbsp.c +1 -1
index adf0097..b1a5b47 100644
@@ -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>
arch/arm/mach-omap2/board-3430sdp.c +1 -1
index a98c688..76d03d3 100644
@@ -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"
arch/arm/mach-omap2/board-cm-t35.c +2 -2
index 97d7190..3f844f4 100644
@@ -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>
arch/arm/mach-omap2/board-cm-t3517.c +1 -1
index a33ad46..e1811ba 100644
@@ -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>
arch/arm/mach-omap2/board-devkit8000.c +2 -2
index 6567c1c..e4456c2 100644
@@ -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>
arch/arm/mach-omap2/board-flash.c +2 -2
index 53c39d2..a1ef5f0 100644
@@ -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"
arch/arm/mach-omap2/board-igep0020.c +1 -1
index 7491529..4e5de5a 100644
@@ -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"
arch/arm/mach-omap2/board-ldp.c +1 -1
index ef9e829..b5ba08b 100644
@@ -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>
arch/arm/mach-omap2/board-n8x0.c +2 -2
index 677357f..a60c575 100644
@@ -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>
arch/arm/mach-omap2/board-omap3beagle.c +1 -1
index 6202fc7..b483d49 100644
@@ -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>
arch/arm/mach-omap2/board-omap3evm.c +2 -2
index ef230a0..89db942 100644
@@ -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>
arch/arm/mach-omap2/board-omap3pandora.c +2 -2
index 57aebee..44ca395 100644
@@ -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"
arch/arm/mach-omap2/board-omap3stalker.c +2 -2
index b318f56..e967363 100644
@@ -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>
arch/arm/mach-omap2/board-omap3touchbook.c +2 -2
index 485d14d..7b4a604 100644
@@ -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"
arch/arm/mach-omap2/board-overo.c +2 -2
index 779734d..db964e6 100644
@@ -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>
arch/arm/mach-omap2/board-rm680.c +1 -1
index 0ad1bb3b..bbfbe56 100644
@@ -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"
arch/arm/mach-omap2/board-rx51-peripherals.c +2 -2
index df2534d..9bfbb61 100644
@@ -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>
arch/arm/mach-omap2/board-rx51-video.c +1 -1
index 2c1289b..7ef0994 100644
@@ -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>
arch/arm/mach-omap2/board-rx51.c +1 -1
index 345dd93..779c67e 100644
@@ -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>
arch/arm/mach-omap2/board-zoom-display.c +1 -1
index 28187f1..660a2932 100644
@@ -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>
arch/arm/mach-omap2/common-board-devices.c +2 -2
index 1473474..eedb6d0 100644
@@ -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"
arch/arm/mach-omap2/devices.c +1 -1
index c00c689..bd1b907 100644
@@ -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)
 {
arch/arm/mach-omap2/dsp.c +1 -1
index a636ebc..9838810 100644
@@ -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;
arch/arm/mach-omap2/gpmc-nand.c +1 -1
index 386dec8..af6f177 100644
@@ -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>
arch/arm/mach-omap2/gpmc-onenand.c +1 -1
index a0fa9bb..d27b02d 100644
@@ -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>
arch/arm/mach-omap2/mcbsp.c +1 -1
index 577cb77..4ee08c6 100644
@@ -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>
arch/arm/mach-omap2/omap_hwmod_2420_data.c +1 -1
index 50cfab6..558c300 100644
@@ -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>
arch/arm/mach-omap2/omap_hwmod_2430_data.c +2 -2
index 58b5bc1..d662766 100644
@@ -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>
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +1 -1
index afad69c..161ae0a 100644
@@ -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>
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +2 -2
index c9e3820..656bb7f 100644
@@ -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"
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +2 -2
index 242aee4..3a06e7d 100644
@@ -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>
arch/arm/mach-omap2/voltage.h +1 -1
index 0ac2caf..7abf1c0 100644
@@ -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"
arch/arm/plat-omap/common.c +1 -1
index 89a3723..f18b73b 100644
@@ -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>
drivers/input/keyboard/omap-keypad.c +1 -1
index a0222db..8aaa326 100644
@@ -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>
drivers/mtd/nand/omap2.c +1 -1
index ac4fd75..5efaac6 100644
@@ -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
drivers/mtd/onenand/omap2.c +1 -1
index 398a827..f9017b3 100644
@@ -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>
drivers/remoteproc/omap_remoteproc.c +1 -1
index a1f7ac1..b54504e 100644
@@ -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"
drivers/spi/spi-omap2-mcspi.c +1 -1
index b2fb141..b9b7ad0 100644
@@ -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
drivers/staging/tidspbridge/core/dsp-clock.c +1 -1
index c7df34e..346fa559 100644
@@ -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>
drivers/staging/tidspbridge/core/tiomap3430.c +1 -1
index f9609ce..7bf55c4 100644
@@ -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 */
drivers/staging/tidspbridge/core/tiomap3430_pwr.c +1 -1
index 16a4aaf..55675b7 100644
@@ -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>
drivers/staging/tidspbridge/core/tiomap_io.c +1 -1
index 7fda10c..f53ed98 100644
@@ -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>
drivers/staging/tidspbridge/rmgr/drv_interface.c +1 -1
index 3cac014..49c9b66 100644
@@ -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>
drivers/video/omap/lcd_mipid.c +1 -1
index e3880c4..b739600 100644
@@ -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"
include/linux/platform_data/dsp-mcbsp.h renamed from arch/arm/plat-omap/include/plat/mcbsp.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/mcbsp.h
rename to include/linux/platform_data/dsp-mcbsp.h
include/linux/platform_data/dsp-omap.h renamed from arch/arm/plat-omap/include/plat/dsp.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/dsp.h
rename to include/linux/platform_data/dsp-omap.h
include/linux/platform_data/keypad-omap.h renamed from arch/arm/plat-omap/include/plat/keypad.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/keypad.h
rename to include/linux/platform_data/keypad-omap.h
include/linux/platform_data/lcd-mipid.h renamed from arch/arm/plat-omap/include/plat/lcd_mipid.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/lcd_mipid.h
rename to include/linux/platform_data/lcd-mipid.h
include/linux/platform_data/mtd-nand-omap2.h renamed from arch/arm/plat-omap/include/plat/nand.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/nand.h
rename to include/linux/platform_data/mtd-nand-omap2.h
include/linux/platform_data/mtd-onenand-omap2.h renamed from arch/arm/plat-omap/include/plat/onenand.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/onenand.h
rename to include/linux/platform_data/mtd-onenand-omap2.h
include/linux/platform_data/remoteproc-omap.h renamed from arch/arm/plat-omap/include/plat/remoteproc.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/remoteproc.h
rename to include/linux/platform_data/remoteproc-omap.h
include/linux/platform_data/smartreflex-omap.h renamed from arch/arm/plat-omap/include/plat/voltage.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/voltage.h
rename to include/linux/platform_data/smartreflex-omap.h
include/linux/platform_data/spi-omap2-mcspi.h renamed from arch/arm/plat-omap/include/plat/mcspi.h +0 -0
similarity index 100%
rename from arch/arm/plat-omap/include/plat/mcspi.h
rename to include/linux/platform_data/spi-omap2-mcspi.h
include/linux/power/smartreflex.h +1 -1
index 3101e62..e376f94 100644
@@ -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
sound/soc/omap/am3517evm.c +1 -1
index 009533a..e815c4a 100644
@@ -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"
sound/soc/omap/ams-delta.c +1 -1
index 7d4fa8e..293e61a 100644
@@ -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"
sound/soc/omap/igep0020.c +1 -1
index e835781..e6393b0 100644
@@ -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"
sound/soc/omap/mcbsp.c +1 -1
index d33c48b..4bc029d 100644
@@ -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"
sound/soc/omap/n810.c +1 -1
index abac4b6..232357b 100644
@@ -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"
sound/soc/omap/omap-mcbsp.c +1 -1
index acdd3ef..deeda47 100644
@@ -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"
sound/soc/omap/omap3beagle.c +1 -1
index 2830dfd..89d115c 100644
@@ -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"
sound/soc/omap/omap3evm.c +1 -1
index 3d468c9..50d0b70 100644
@@ -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"
sound/soc/omap/omap3pandora.c +1 -1
index 4c3a097..68c4e16 100644
@@ -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"
sound/soc/omap/osk5912.c +1 -1
index b1a9d64..27b9a05 100644
@@ -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"
sound/soc/omap/overo.c +1 -1
index 6ac3e0c..080c984 100644
@@ -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"
sound/soc/omap/rx51.c +1 -1
index 2712dd2..5b21bc4 100644
@@ -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>
sound/soc/omap/sdp3430.c +1 -1
index 0e28322..33f4ac2 100644
@@ -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>
sound/soc/omap/zoom2.c +1 -1
index 920e0d9..558364f 100644
@@ -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>
Signature · 1 line
1.7.10