linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 00/16] ARM: big platform data header rename
       [not found] <1347368245-30989-1-git-send-email-arnd@arndb.de>
@ 2012-09-11 12:59 ` Arnd Bergmann
       [not found]   ` <1347368390-31252-1-git-send-email-arnd@arndb.de>
  0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2012-09-11 12:59 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: linux-kernel, Russell King, Arnd Bergmann, netdev, openezx-devel,
	spear-devel, davinci-linux-open-source, linux-arm-msm, linux-omap,
	linux-samsung-soc, linux-tegra

As we discussed at the ARM mini summit in San Diego, we are
going to move all platform specific header files that are used
in drivers out of the mach-* directories, at least for those
platforms that we want to have in a multiplatform kernel.

A big step in this direction is to move all the platform_data
definitions into include/linux/platform_data/. This takes
care of about a third of the header files in question and
should be relatively uncontroversial.

I changed the file names after the rename to be
include/linux/${subsystem}-${driver}.h where possible, to
have a more consistent naming there.

I would like to merge the series through the arm-soc tree
as an early branch so other branches can be based on top
or merge this branch into the other one to avoid conflicts.

Platform maintainers: please provide ACKs so I can take
it into the for-next branch as a stable sub-branch.

Driver maintainers: There should be nothing controversial
here, just a heads-up so you know that some one-line changes
are coming through the arm-soc tree that might cause an
occasional merge conflict. I've put a lot of people on
bcc in this mail so they know what the individual ones are
about. If you have specific comments, please reply on the
patches you are Cc'd on.

	Arnd

Arnd Bergmann (16):
  ARM: at91: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: sa1100: move platform_data definitions
  ARM: tegra: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: omap: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: spear: move platform_data definitions

 Documentation/spi/ep93xx_spi                       |    2 +-
 arch/arm/mach-at91/at91sam9g45_devices.c           |    2 +-
 arch/arm/mach-at91/at91sam9rl_devices.c            |    2 +-
 arch/arm/mach-at91/include/mach/at_hdmac.h         |   61 -------
 arch/arm/mach-at91/include/mach/atmel-mci.h        |    2 +-
 arch/arm/mach-davinci/aemif.c                      |    2 +-
 arch/arm/mach-davinci/board-da830-evm.c            |    8 +-
 arch/arm/mach-davinci/board-da850-evm.c            |    6 +-
 arch/arm/mach-davinci/board-dm355-evm.c            |    8 +-
 arch/arm/mach-davinci/board-dm355-leopard.c        |    8 +-
 arch/arm/mach-davinci/board-dm365-evm.c            |    8 +-
 arch/arm/mach-davinci/board-dm644x-evm.c           |   10 +-
 arch/arm/mach-davinci/board-dm646x-evm.c           |    6 +-
 arch/arm/mach-davinci/board-mityomapl138.c         |    4 +-
 arch/arm/mach-davinci/board-neuros-osd2.c          |    8 +-
 arch/arm/mach-davinci/board-sffsdr.c               |    4 +-
 arch/arm/mach-davinci/davinci.h                    |    4 +-
 arch/arm/mach-davinci/devices.c                    |    4 +-
 arch/arm/mach-davinci/dm355.c                      |    4 +-
 arch/arm/mach-davinci/dm365.c                      |    6 +-
 arch/arm/mach-davinci/dm644x.c                     |    2 +-
 arch/arm/mach-davinci/dm646x.c                     |    2 +-
 arch/arm/mach-davinci/include/mach/aemif.h         |   36 ----
 arch/arm/mach-davinci/include/mach/asp.h           |  137 ---------------
 arch/arm/mach-davinci/include/mach/da8xx.h         |   10 +-
 arch/arm/mach-davinci/include/mach/i2c.h           |   26 ---
 arch/arm/mach-davinci/include/mach/keyscan.h       |   42 -----
 arch/arm/mach-davinci/include/mach/mmc.h           |   39 -----
 arch/arm/mach-davinci/include/mach/nand.h          |   90 ----------
 arch/arm/mach-davinci/include/mach/spi.h           |   89 ----------
 arch/arm/mach-davinci/include/mach/tnetv107x.h     |    4 +-
 arch/arm/mach-davinci/include/mach/usb.h           |   59 -------
 arch/arm/mach-davinci/usb.c                        |    2 +-
 arch/arm/mach-dove/common.c                        |    2 +-
 arch/arm/mach-ep93xx/core.c                        |    6 +-
 arch/arm/mach-ep93xx/dma.c                         |    2 +-
 arch/arm/mach-ep93xx/edb93xx.c                     |    4 +-
 arch/arm/mach-ep93xx/include/mach/dma.h            |   93 -----------
 arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h  |   35 ----
 arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h     |   29 ----
 arch/arm/mach-ep93xx/include/mach/fb.h             |   56 -------
 arch/arm/mach-ep93xx/simone.c                      |    2 +-
 arch/arm/mach-ep93xx/snappercl15.c                 |    2 +-
 arch/arm/mach-ep93xx/vision_ep9307.c               |    4 +-
 arch/arm/mach-exynos/dev-audio.c                   |    2 +-
 arch/arm/mach-exynos/dev-ohci.c                    |    2 +-
 arch/arm/mach-exynos/include/mach/ohci.h           |   21 ---
 arch/arm/mach-exynos/mach-nuri.c                   |    6 +-
 arch/arm/mach-exynos/mach-origen.c                 |    6 +-
 arch/arm/mach-exynos/mach-smdk4x12.c               |    2 +-
 arch/arm/mach-exynos/mach-smdkv310.c               |    6 +-
 arch/arm/mach-exynos/mach-universal_c210.c         |    4 +-
 arch/arm/mach-exynos/setup-i2c0.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c1.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c2.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c3.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c4.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c5.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c6.c                  |    2 +-
 arch/arm/mach-exynos/setup-i2c7.c                  |    2 +-
 arch/arm/mach-imx/ehci-imx25.c                     |    2 +-
 arch/arm/mach-imx/ehci-imx27.c                     |    2 +-
 arch/arm/mach-imx/ehci-imx31.c                     |    2 +-
 arch/arm/mach-imx/ehci-imx35.c                     |    2 +-
 arch/arm/mach-imx/ehci-imx5.c                      |    2 +-
 arch/arm/mach-imx/mach-mx31moboard.c               |    2 +-
 arch/arm/mach-imx/mx1-camera-fiq-ksym.c            |    2 +-
 arch/arm/mach-kirkwood/board-dreamplug.c           |    2 +-
 arch/arm/mach-kirkwood/board-goflexnet.c           |    2 +-
 arch/arm/mach-kirkwood/common.c                    |   10 +-
 arch/arm/mach-kirkwood/d2net_v2-setup.c            |    2 +-
 arch/arm/mach-kirkwood/db88f6281-bp-setup.c        |    2 +-
 arch/arm/mach-kirkwood/dockstar-setup.c            |    2 +-
 arch/arm/mach-kirkwood/guruplug-setup.c            |    2 +-
 arch/arm/mach-kirkwood/include/mach/leds-netxbig.h |   55 ------
 arch/arm/mach-kirkwood/include/mach/leds-ns2.h     |   26 ---
 arch/arm/mach-kirkwood/netspace_v2-setup.c         |    2 +-
 arch/arm/mach-kirkwood/netxbig_v2-setup.c          |    2 +-
 arch/arm/mach-kirkwood/openrd-setup.c              |    2 +-
 arch/arm/mach-kirkwood/rd88f6281-setup.c           |    2 +-
 arch/arm/mach-kirkwood/sheevaplug-setup.c          |    2 +-
 arch/arm/mach-mmp/aspenite.c                       |    2 +-
 arch/arm/mach-mmp/include/mach/mmp2.h              |    2 +-
 arch/arm/mach-mmp/include/mach/pxa168.h            |    4 +-
 arch/arm/mach-mmp/include/mach/pxa910.h            |    2 +-
 arch/arm/mach-mmp/include/mach/sram.h              |   35 ----
 arch/arm/mach-mmp/sram.c                           |    2 +-
 arch/arm/mach-mmp/teton_bga.c                      |    2 +-
 arch/arm/mach-msm/board-qsd8x50.c                  |    2 +-
 arch/arm/mach-msm/board-trout-mmc.c                |    2 +-
 arch/arm/mach-msm/board-trout-panel.c              |    2 +-
 arch/arm/mach-msm/devices-msm7x00.c                |    2 +-
 arch/arm/mach-msm/devices-msm7x30.c                |    2 +-
 arch/arm/mach-msm/devices-qsd8x50.c                |    2 +-
 arch/arm/mach-msm/include/mach/board.h             |    2 +-
 arch/arm/mach-msm/include/mach/mmc.h               |   30 ----
 arch/arm/mach-msm/include/mach/msm_fb.h            |  147 ----------------
 arch/arm/mach-mv78xx0/common.c                     |    4 +-
 arch/arm/mach-netx/include/mach/eth.h              |   27 ---
 arch/arm/mach-netx/nxdb500.c                       |    2 +-
 arch/arm/mach-netx/nxdkn.c                         |    2 +-
 arch/arm/mach-netx/nxeb500hmi.c                    |    2 +-
 arch/arm/mach-nomadik/board-nhk8815.c              |    2 +-
 arch/arm/mach-nomadik/include/mach/nand.h          |   16 --
 arch/arm/mach-omap1/board-ams-delta.c              |    2 +-
 arch/arm/mach-omap1/board-fsample.c                |    2 +-
 arch/arm/mach-omap1/board-h2.c                     |    2 +-
 arch/arm/mach-omap1/board-h3.c                     |    2 +-
 arch/arm/mach-omap1/board-htcherald.c              |    2 +-
 arch/arm/mach-omap1/board-innovator.c              |    2 +-
 arch/arm/mach-omap1/board-nokia770.c               |    4 +-
 arch/arm/mach-omap1/board-osk.c                    |    2 +-
 arch/arm/mach-omap1/board-palmte.c                 |    2 +-
 arch/arm/mach-omap1/board-palmtt.c                 |    2 +-
 arch/arm/mach-omap1/board-palmz71.c                |    2 +-
 arch/arm/mach-omap1/board-perseus2.c               |    2 +-
 arch/arm/mach-omap1/board-sx1.c                    |    2 +-
 arch/arm/mach-omap1/mcbsp.c                        |    2 +-
 arch/arm/mach-omap2/board-3430sdp.c                |    2 +-
 arch/arm/mach-omap2/board-cm-t35.c                 |    4 +-
 arch/arm/mach-omap2/board-cm-t3517.c               |    2 +-
 arch/arm/mach-omap2/board-devkit8000.c             |    4 +-
 arch/arm/mach-omap2/board-flash.c                  |    4 +-
 arch/arm/mach-omap2/board-igep0020.c               |    2 +-
 arch/arm/mach-omap2/board-ldp.c                    |    2 +-
 arch/arm/mach-omap2/board-n8x0.c                   |    4 +-
 arch/arm/mach-omap2/board-omap3beagle.c            |    2 +-
 arch/arm/mach-omap2/board-omap3evm.c               |    4 +-
 arch/arm/mach-omap2/board-omap3pandora.c           |    4 +-
 arch/arm/mach-omap2/board-omap3stalker.c           |    4 +-
 arch/arm/mach-omap2/board-omap3touchbook.c         |    4 +-
 arch/arm/mach-omap2/board-overo.c                  |    4 +-
 arch/arm/mach-omap2/board-rm680.c                  |    2 +-
 arch/arm/mach-omap2/board-rx51-peripherals.c       |    4 +-
 arch/arm/mach-omap2/board-rx51-video.c             |    2 +-
 arch/arm/mach-omap2/board-rx51.c                   |    2 +-
 arch/arm/mach-omap2/board-zoom-display.c           |    2 +-
 arch/arm/mach-omap2/common-board-devices.c         |    4 +-
 arch/arm/mach-omap2/devices.c                      |    2 +-
 arch/arm/mach-omap2/dsp.c                          |    2 +-
 arch/arm/mach-omap2/gpmc-nand.c                    |    2 +-
 arch/arm/mach-omap2/gpmc-onenand.c                 |    2 +-
 arch/arm/mach-omap2/mcbsp.c                        |    2 +-
 arch/arm/mach-omap2/omap_hwmod_2420_data.c         |    2 +-
 arch/arm/mach-omap2/omap_hwmod_2430_data.c         |    4 +-
 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c |    2 +-
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |    4 +-
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |    4 +-
 arch/arm/mach-omap2/voltage.h                      |    2 +-
 arch/arm/mach-orion5x/common.c                     |    4 +-
 arch/arm/mach-orion5x/db88f5281-setup.c            |    2 +-
 arch/arm/mach-orion5x/kurobox_pro-setup.c          |    2 +-
 arch/arm/mach-pxa/am200epd.c                       |    2 +-
 arch/arm/mach-pxa/am300epd.c                       |    2 +-
 arch/arm/mach-pxa/balloon3.c                       |    8 +-
 arch/arm/mach-pxa/cm-x270.c                        |    4 +-
 arch/arm/mach-pxa/cm-x2xx.c                        |    2 +-
 arch/arm/mach-pxa/cm-x300.c                        |   10 +-
 arch/arm/mach-pxa/colibri-evalboard.c              |    4 +-
 arch/arm/mach-pxa/colibri-pxa270-income.c          |    6 +-
 arch/arm/mach-pxa/colibri-pxa300.c                 |    4 +-
 arch/arm/mach-pxa/colibri-pxa320.c                 |    4 +-
 arch/arm/mach-pxa/colibri-pxa3xx.c                 |    6 +-
 arch/arm/mach-pxa/corgi.c                          |    4 +-
 arch/arm/mach-pxa/csb726.c                         |    4 +-
 arch/arm/mach-pxa/devices.c                        |   16 +-
 arch/arm/mach-pxa/em-x270.c                        |   10 +-
 arch/arm/mach-pxa/eseries.c                        |    4 +-
 arch/arm/mach-pxa/ezx.c                            |    8 +-
 arch/arm/mach-pxa/gumstix.c                        |    2 +-
 arch/arm/mach-pxa/hx4700.c                         |    2 +-
 arch/arm/mach-pxa/idp.c                            |    4 +-
 arch/arm/mach-pxa/include/mach/arcom-pcmcia.h      |   11 --
 arch/arm/mach-pxa/include/mach/camera.h            |   44 -----
 arch/arm/mach-pxa/include/mach/irda.h              |   25 ---
 arch/arm/mach-pxa/include/mach/mmc.h               |   28 ----
 arch/arm/mach-pxa/include/mach/ohci.h              |   36 ----
 arch/arm/mach-pxa/include/mach/palmasoc.h          |    8 -
 arch/arm/mach-pxa/include/mach/pata_pxa.h          |   33 ----
 arch/arm/mach-pxa/include/mach/pxa3xx-u2d.h        |   35 ----
 arch/arm/mach-pxa/include/mach/pxa930_rotary.h     |   20 ---
 arch/arm/mach-pxa/include/mach/pxa930_trkball.h    |   10 --
 arch/arm/mach-pxa/include/mach/pxafb.h             |  175 --------------------
 arch/arm/mach-pxa/littleton.c                      |    8 +-
 arch/arm/mach-pxa/lpd270.c                         |    8 +-
 arch/arm/mach-pxa/lubbock.c                        |    6 +-
 arch/arm/mach-pxa/magician.c                       |    8 +-
 arch/arm/mach-pxa/mainstone.c                      |   10 +-
 arch/arm/mach-pxa/mioa701.c                        |    8 +-
 arch/arm/mach-pxa/mxm8x10.c                        |    8 +-
 arch/arm/mach-pxa/palm27x.c                        |    8 +-
 arch/arm/mach-pxa/palmld.c                         |   10 +-
 arch/arm/mach-pxa/palmt5.c                         |   10 +-
 arch/arm/mach-pxa/palmtc.c                         |    6 +-
 arch/arm/mach-pxa/palmte2.c                        |    8 +-
 arch/arm/mach-pxa/palmtreo.c                       |   14 +-
 arch/arm/mach-pxa/palmtx.c                         |   10 +-
 arch/arm/mach-pxa/palmz72.c                        |   12 +-
 arch/arm/mach-pxa/pcm990-baseboard.c               |    8 +-
 arch/arm/mach-pxa/poodle.c                         |    6 +-
 arch/arm/mach-pxa/pxa27x.c                         |    2 +-
 arch/arm/mach-pxa/pxa2xx.c                         |    2 +-
 arch/arm/mach-pxa/pxa3xx-ulpi.c                    |    2 +-
 arch/arm/mach-pxa/pxa3xx.c                         |    2 +-
 arch/arm/mach-pxa/raumfeld.c                       |    8 +-
 arch/arm/mach-pxa/saar.c                           |    2 +-
 arch/arm/mach-pxa/spitz.c                          |    8 +-
 arch/arm/mach-pxa/stargate2.c                      |    2 +-
 arch/arm/mach-pxa/tavorevb.c                       |    4 +-
 arch/arm/mach-pxa/tosa.c                           |    4 +-
 arch/arm/mach-pxa/trizeps4.c                       |    8 +-
 arch/arm/mach-pxa/viper.c                          |    4 +-
 arch/arm/mach-pxa/vpac270.c                        |    8 +-
 arch/arm/mach-pxa/z2.c                             |    6 +-
 arch/arm/mach-pxa/zeus.c                           |    8 +-
 arch/arm/mach-pxa/zylonite.c                       |   10 +-
 arch/arm/mach-s3c24xx/common-smdk.c                |    4 +-
 arch/arm/mach-s3c24xx/include/mach/leds-gpio.h     |   28 ----
 arch/arm/mach-s3c24xx/mach-amlm5900.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-anubis.c                |    6 +-
 arch/arm/mach-s3c24xx/mach-at2440evb.c             |    6 +-
 arch/arm/mach-s3c24xx/mach-bast.c                  |    8 +-
 arch/arm/mach-s3c24xx/mach-gta02.c                 |   10 +-
 arch/arm/mach-s3c24xx/mach-h1940.c                 |    8 +-
 arch/arm/mach-s3c24xx/mach-jive.c                  |    6 +-
 arch/arm/mach-s3c24xx/mach-mini2440.c              |   10 +-
 arch/arm/mach-s3c24xx/mach-n30.c                   |    8 +-
 arch/arm/mach-s3c24xx/mach-nexcoder.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-osiris.c                |    4 +-
 arch/arm/mach-s3c24xx/mach-otom.c                  |    2 +-
 arch/arm/mach-s3c24xx/mach-qt2410.c                |    8 +-
 arch/arm/mach-s3c24xx/mach-rx1950.c                |   10 +-
 arch/arm/mach-s3c24xx/mach-rx3715.c                |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2410.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2413.c              |    4 +-
 arch/arm/mach-s3c24xx/mach-smdk2416.c              |    8 +-
 arch/arm/mach-s3c24xx/mach-smdk2440.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-smdk2443.c              |    2 +-
 arch/arm/mach-s3c24xx/mach-tct_hammer.c            |    2 +-
 arch/arm/mach-s3c24xx/mach-vr1000.c                |    6 +-
 arch/arm/mach-s3c24xx/mach-vstms.c                 |    4 +-
 arch/arm/mach-s3c24xx/setup-i2c.c                  |    2 +-
 arch/arm/mach-s3c24xx/simtec-audio.c               |    2 +-
 arch/arm/mach-s3c24xx/simtec-usb.c                 |    2 +-
 arch/arm/mach-s3c64xx/dev-audio.c                  |    2 +-
 arch/arm/mach-s3c64xx/mach-anw6410.c               |    2 +-
 arch/arm/mach-s3c64xx/mach-crag6410-module.c       |    2 +-
 arch/arm/mach-s3c64xx/mach-crag6410.c              |    4 +-
 arch/arm/mach-s3c64xx/mach-hmt.c                   |    4 +-
 arch/arm/mach-s3c64xx/mach-mini6410.c              |    4 +-
 arch/arm/mach-s3c64xx/mach-ncp.c                   |    2 +-
 arch/arm/mach-s3c64xx/mach-real6410.c              |    4 +-
 arch/arm/mach-s3c64xx/mach-smartq.c                |    8 +-
 arch/arm/mach-s3c64xx/mach-smdk6400.c              |    2 +-
 arch/arm/mach-s3c64xx/mach-smdk6410.c              |    6 +-
 arch/arm/mach-s3c64xx/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s3c64xx/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s3c64xx/setup-ide.c                  |    2 +-
 arch/arm/mach-s5p64x0/dev-audio.c                  |    2 +-
 arch/arm/mach-s5p64x0/mach-smdk6440.c              |    4 +-
 arch/arm/mach-s5p64x0/mach-smdk6450.c              |    4 +-
 arch/arm/mach-s5p64x0/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5p64x0/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pc100/dev-audio.c                  |    2 +-
 arch/arm/mach-s5pc100/mach-smdkc100.c              |    8 +-
 arch/arm/mach-s5pc100/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5pc100/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pv210/dev-audio.c                  |    2 +-
 arch/arm/mach-s5pv210/mach-goni.c                  |    2 +-
 arch/arm/mach-s5pv210/mach-smdkc110.c              |    4 +-
 arch/arm/mach-s5pv210/mach-smdkv210.c              |    6 +-
 arch/arm/mach-s5pv210/mach-torbreck.c              |    2 +-
 arch/arm/mach-s5pv210/setup-i2c0.c                 |    2 +-
 arch/arm/mach-s5pv210/setup-i2c1.c                 |    2 +-
 arch/arm/mach-s5pv210/setup-i2c2.c                 |    2 +-
 arch/arm/mach-sa1100/assabet.c                     |    2 +-
 arch/arm/mach-sa1100/cerf.c                        |    2 +-
 arch/arm/mach-sa1100/collie.c                      |    2 +-
 arch/arm/mach-sa1100/include/mach/mcp.h            |   22 ---
 arch/arm/mach-sa1100/lart.c                        |    2 +-
 arch/arm/mach-sa1100/shannon.c                     |    2 +-
 arch/arm/mach-sa1100/simpad.c                      |    2 +-
 arch/arm/mach-tegra/board-harmony.c                |    4 +-
 arch/arm/mach-tegra/board-paz00.c                  |    2 +-
 arch/arm/mach-tegra/board-trimslice.c              |    2 +-
 arch/arm/mach-tegra/include/mach/kbc.h             |   62 -------
 arch/arm/mach-tegra/include/mach/sdhci.h           |   30 ----
 .../mach-tegra/include/mach/tegra_wm8903_pdata.h   |   23 ---
 arch/arm/mach-u300/core.c                          |    2 +-
 arch/arm/mach-u300/include/mach/gpio-u300.h        |   37 -----
 arch/arm/mach-ux500/board-mop500.c                 |    2 +-
 arch/arm/mach-ux500/cpu-db8500.c                   |    2 +-
 arch/arm/mach-ux500/devices-common.h               |    2 +-
 arch/arm/mach-ux500/include/mach/crypto-ux500.h    |   22 ---
 arch/arm/mach-ux500/include/mach/usb.h             |   25 ---
 arch/arm/mach-ux500/usb.c                          |    2 +-
 arch/arm/mach-vt8500/devices.c                     |    2 +-
 arch/arm/mach-vt8500/include/mach/vt8500fb.h       |   31 ----
 arch/arm/mach-w90x900/dev.c                        |    6 +-
 arch/arm/mach-w90x900/include/mach/fb.h            |   83 ----------
 arch/arm/mach-w90x900/include/mach/i2c.h           |    9 -
 arch/arm/mach-w90x900/include/mach/nuc900_spi.h    |   35 ----
 .../arm/mach-w90x900/include/mach/w90p910_keypad.h |   15 --
 arch/arm/mach-w90x900/mach-nuc950evb.c             |    2 +-
 .../plat-mxc/devices/platform-sdhci-esdhc-imx.c    |    2 +-
 arch/arm/plat-mxc/include/mach/devices-common.h    |   32 ++--
 arch/arm/plat-mxc/include/mach/dma.h               |   67 --------
 arch/arm/plat-mxc/include/mach/esdhc.h             |   43 -----
 arch/arm/plat-mxc/include/mach/i2c.h               |   21 ---
 arch/arm/plat-mxc/include/mach/imx-uart.h          |   35 ----
 arch/arm/plat-mxc/include/mach/imxfb.h             |   84 ----------
 arch/arm/plat-mxc/include/mach/mmc.h               |   39 -----
 arch/arm/plat-mxc/include/mach/mx1_camera.h        |   35 ----
 arch/arm/plat-mxc/include/mach/mx21-usbhost.h      |   38 -----
 arch/arm/plat-mxc/include/mach/mx2_cam.h           |   46 -----
 arch/arm/plat-mxc/include/mach/mx3_camera.h        |   48 ------
 arch/arm/plat-mxc/include/mach/mx3fb.h             |   53 ------
 arch/arm/plat-mxc/include/mach/mxc_ehci.h          |   59 -------
 arch/arm/plat-mxc/include/mach/mxc_nand.h          |   32 ----
 arch/arm/plat-mxc/include/mach/sdma.h              |   59 -------
 arch/arm/plat-mxc/include/mach/spi.h               |   27 ---
 arch/arm/plat-mxc/include/mach/ssi.h               |   21 ---
 arch/arm/plat-mxc/include/mach/usb.h               |   23 ---
 arch/arm/plat-mxc/ssi-fiq-ksym.c                   |    2 +-
 arch/arm/plat-nomadik/include/plat/ske.h           |   50 ------
 arch/arm/plat-omap/common.c                        |    2 +-
 arch/arm/plat-omap/include/plat/dsp.h              |   34 ----
 arch/arm/plat-omap/include/plat/keypad.h           |   52 ------
 arch/arm/plat-omap/include/plat/lcd_mipid.h        |   29 ----
 arch/arm/plat-omap/include/plat/mcbsp.h            |   62 -------
 arch/arm/plat-omap/include/plat/mcspi.h            |   23 ---
 arch/arm/plat-omap/include/plat/nand.h             |   44 -----
 arch/arm/plat-omap/include/plat/onenand.h          |   53 ------
 arch/arm/plat-omap/include/plat/remoteproc.h       |   57 -------
 arch/arm/plat-omap/include/plat/voltage.h          |   39 -----
 arch/arm/plat-orion/common.c                       |    4 +-
 arch/arm/plat-orion/include/plat/audio.h           |    7 -
 arch/arm/plat-orion/include/plat/ehci-orion.h      |   26 ---
 arch/arm/plat-orion/include/plat/mv_xor.h          |   24 ---
 arch/arm/plat-orion/include/plat/mvsdio.h          |   20 ---
 arch/arm/plat-orion/include/plat/orion_nand.h      |   26 ---
 arch/arm/plat-pxa/include/plat/pxa27x_keypad.h     |   73 --------
 arch/arm/plat-pxa/include/plat/pxa3xx_nand.h       |   79 ---------
 arch/arm/plat-samsung/devs.c                       |   20 +--
 arch/arm/plat-samsung/include/plat/ata.h           |   36 ----
 arch/arm/plat-samsung/include/plat/audio-simtec.h  |   34 ----
 arch/arm/plat-samsung/include/plat/audio.h         |   59 -------
 arch/arm/plat-samsung/include/plat/ehci.h          |   21 ---
 arch/arm/plat-samsung/include/plat/hwmon.h         |   51 ------
 arch/arm/plat-samsung/include/plat/iic.h           |   77 ---------
 arch/arm/plat-samsung/include/plat/mci.h           |   52 ------
 arch/arm/plat-samsung/include/plat/mipi_csis.h     |   43 -----
 arch/arm/plat-samsung/include/plat/nand.h          |   67 --------
 arch/arm/plat-samsung/include/plat/s3c64xx-spi.h   |   68 --------
 arch/arm/plat-samsung/include/plat/ts.h            |   25 ---
 arch/arm/plat-samsung/include/plat/udc.h           |   44 -----
 arch/arm/plat-samsung/include/plat/usb-control.h   |   43 -----
 arch/arm/plat-spear/include/plat/keyboard.h        |  164 ------------------
 drivers/ata/pata_ep93xx.c                          |    2 +-
 drivers/ata/pata_pxa.c                             |    2 +-
 drivers/ata/pata_samsung_cf.c                      |    2 +-
 drivers/crypto/ux500/cryp/cryp_core.c              |    2 +-
 drivers/crypto/ux500/hash/hash_core.c              |    2 +-
 drivers/dma/at_hdmac_regs.h                        |    2 +-
 drivers/dma/ep93xx_dma.c                           |    2 +-
 drivers/dma/imx-dma.c                              |    2 +-
 drivers/dma/imx-sdma.c                             |    4 +-
 drivers/dma/mmp_tdma.c                             |    2 +-
 drivers/dma/mv_xor.c                               |    2 +-
 drivers/hwmon/s3c-hwmon.c                          |    2 +-
 drivers/i2c/busses/i2c-davinci.c                   |    2 +-
 drivers/i2c/busses/i2c-imx.c                       |    2 +-
 drivers/i2c/busses/i2c-nuc900.c                    |    2 +-
 drivers/i2c/busses/i2c-s3c2410.c                   |    2 +-
 drivers/input/keyboard/davinci_keyscan.c           |    2 +-
 drivers/input/keyboard/ep93xx_keypad.c             |    2 +-
 drivers/input/keyboard/nomadik-ske-keypad.c        |    2 +-
 drivers/input/keyboard/omap-keypad.c               |    2 +-
 drivers/input/keyboard/pxa27x_keypad.c             |    2 +-
 drivers/input/keyboard/pxa930_rotary.c             |    2 +-
 drivers/input/keyboard/spear-keyboard.c            |    2 +-
 drivers/input/keyboard/tegra-kbc.c                 |    2 +-
 drivers/input/keyboard/w90p910_keypad.c            |    2 +-
 drivers/input/mouse/pxa930_trkball.c               |    2 +-
 drivers/input/touchscreen/s3c2410_ts.c             |    2 +-
 drivers/leds/leds-netxbig.c                        |    2 +-
 drivers/leds/leds-ns2.c                            |    2 +-
 drivers/leds/leds-s3c24xx.c                        |    2 +-
 drivers/media/video/davinci/vpbe_venc.c            |    2 +-
 drivers/media/video/mx1_camera.c                   |    2 +-
 drivers/media/video/mx2_camera.c                   |    2 +-
 drivers/media/video/mx3_camera.c                   |    4 +-
 drivers/media/video/pxa_camera.c                   |    2 +-
 drivers/media/video/s5p-fimc/mipi-csis.c           |    2 +-
 drivers/mfd/mcp-sa11x0.c                           |    2 +-
 drivers/mmc/host/davinci_mmc.c                     |    2 +-
 drivers/mmc/host/msm_sdcc.c                        |    2 +-
 drivers/mmc/host/mvsdio.c                          |    2 +-
 drivers/mmc/host/mxcmmc.c                          |    4 +-
 drivers/mmc/host/pxamci.c                          |    2 +-
 drivers/mmc/host/s3cmci.c                          |    2 +-
 drivers/mmc/host/sdhci-esdhc-imx.c                 |    2 +-
 drivers/mmc/host/sdhci-tegra.c                     |    2 +-
 drivers/mtd/nand/davinci_nand.c                    |    4 +-
 drivers/mtd/nand/mxc_nand.c                        |    2 +-
 drivers/mtd/nand/nomadik_nand.c                    |    2 +-
 drivers/mtd/nand/omap2.c                           |    2 +-
 drivers/mtd/nand/orion_nand.c                      |    2 +-
 drivers/mtd/nand/pxa3xx_nand.c                     |    2 +-
 drivers/mtd/nand/s3c2410.c                         |    2 +-
 drivers/mtd/onenand/omap2.c                        |    2 +-
 drivers/net/ethernet/netx-eth.c                    |    2 +-
 drivers/net/irda/pxaficp_ir.c                      |    2 +-
 drivers/pcmcia/pxa2xx_viper.c                      |    2 +-
 drivers/pinctrl/pinctrl-coh901.c                   |    2 +-
 drivers/remoteproc/omap_remoteproc.c               |    2 +-
 drivers/spi/spi-davinci.c                          |    2 +-
 drivers/spi/spi-ep93xx.c                           |    4 +-
 drivers/spi/spi-imx.c                              |    2 +-
 drivers/spi/spi-nuc900.c                           |    2 +-
 drivers/spi/spi-omap2-mcspi.c                      |    2 +-
 drivers/spi/spi-s3c64xx.c                          |    2 +-
 drivers/staging/tidspbridge/core/dsp-clock.c       |    2 +-
 drivers/staging/tidspbridge/core/tiomap3430.c      |    2 +-
 drivers/staging/tidspbridge/core/tiomap3430_pwr.c  |    2 +-
 drivers/staging/tidspbridge/core/tiomap_io.c       |    2 +-
 drivers/staging/tidspbridge/rmgr/drv_interface.c   |    2 +-
 drivers/tty/serial/imx.c                           |    2 +-
 drivers/usb/gadget/imx_udc.c                       |    2 +-
 drivers/usb/gadget/s3c2410_udc.c                   |    2 +-
 drivers/usb/host/ehci-mxc.c                        |    2 +-
 drivers/usb/host/ehci-orion.c                      |    2 +-
 drivers/usb/host/ehci-s5p.c                        |    2 +-
 drivers/usb/host/imx21-hcd.h                       |    2 +-
 drivers/usb/host/ohci-da8xx.c                      |    2 +-
 drivers/usb/host/ohci-exynos.c                     |    2 +-
 drivers/usb/host/ohci-pxa27x.c                     |    4 +-
 drivers/usb/host/ohci-s3c2410.c                    |    2 +-
 drivers/usb/musb/da8xx.c                           |    2 +-
 drivers/usb/musb/ux500_dma.c                       |    2 +-
 drivers/video/ep93xx-fb.c                          |    2 +-
 drivers/video/imxfb.c                              |    2 +-
 drivers/video/msm/mddi.c                           |    2 +-
 drivers/video/msm/mddi_client_dummy.c              |    2 +-
 drivers/video/msm/mddi_client_nt35399.c            |    2 +-
 drivers/video/msm/mddi_client_toshiba.c            |    2 +-
 drivers/video/msm/mdp.c                            |    2 +-
 drivers/video/msm/mdp_hw.h                         |    2 +-
 drivers/video/msm/mdp_ppp.c                        |    2 +-
 drivers/video/msm/msm_fb.c                         |    2 +-
 drivers/video/mx3fb.c                              |    4 +-
 drivers/video/nuc900fb.c                           |    2 +-
 drivers/video/nuc900fb.h                           |    2 +-
 drivers/video/omap/lcd_mipid.c                     |    2 +-
 drivers/video/pxafb.c                              |    2 +-
 drivers/video/vt8500lcdfb.c                        |    2 +-
 drivers/video/wm8505fb.c                           |    2 +-
 include/linux/platform_data/asoc-davinci-evm.h     |  137 +++++++++++++++
 include/linux/platform_data/asoc-imx-ssi.h         |   21 +++
 include/linux/platform_data/asoc-kirkwood.h        |    7 +
 include/linux/platform_data/asoc-palm27x.h         |    8 +
 include/linux/platform_data/asoc-s3c.h             |   59 +++++++
 include/linux/platform_data/asoc-s3c24xx_simtec.h  |   34 ++++
 include/linux/platform_data/asoc-tegra_wm8903.h    |   23 +++
 include/linux/platform_data/ata-pxa.h              |   33 ++++
 include/linux/platform_data/ata-samsung_cf.h       |   36 ++++
 include/linux/platform_data/atmel-aes.h            |    2 +-
 include/linux/platform_data/camera-mx1.h           |   35 ++++
 include/linux/platform_data/camera-mx2.h           |   46 +++++
 include/linux/platform_data/camera-mx3.h           |   48 ++++++
 include/linux/platform_data/camera-pxa.h           |   44 +++++
 include/linux/platform_data/crypto-ux500.h         |   22 +++
 include/linux/platform_data/dma-atmel.h            |   61 +++++++
 include/linux/platform_data/dma-ep93xx.h           |   93 +++++++++++
 include/linux/platform_data/dma-imx-sdma.h         |   59 +++++++
 include/linux/platform_data/dma-imx.h              |   67 ++++++++
 include/linux/platform_data/dma-mmp_tdma.h         |   35 ++++
 include/linux/platform_data/dma-mv_xor.h           |   24 +++
 include/linux/platform_data/dsp-mcbsp.h            |   62 +++++++
 include/linux/platform_data/dsp-omap.h             |   34 ++++
 include/linux/platform_data/eth-netx.h             |   27 +++
 include/linux/platform_data/hwmon-s3c.h            |   51 ++++++
 include/linux/platform_data/i2c-davinci.h          |   26 +++
 include/linux/platform_data/i2c-imx.h              |   21 +++
 include/linux/platform_data/i2c-nuc900.h           |    9 +
 include/linux/platform_data/i2c-s3c2410.h          |   77 +++++++++
 include/linux/platform_data/irda-pxaficp.h         |   25 +++
 .../linux/platform_data/keyboard-pxa930_rotary.h   |   20 +++
 include/linux/platform_data/keyboard-spear.h       |  164 ++++++++++++++++++
 include/linux/platform_data/keyboard-tegra-kbc.h   |   62 +++++++
 include/linux/platform_data/keypad-ep93xx.h        |   35 ++++
 include/linux/platform_data/keypad-nomadik-ske.h   |   50 ++++++
 include/linux/platform_data/keypad-omap.h          |   52 ++++++
 include/linux/platform_data/keypad-pxa27x.h        |   73 ++++++++
 include/linux/platform_data/keypad-w90p910.h       |   15 ++
 include/linux/platform_data/keyscan-davinci.h      |   42 +++++
 include/linux/platform_data/lcd-mipid.h            |   29 ++++
 .../linux/platform_data/leds-kirkwood-netxbig.h    |   55 ++++++
 include/linux/platform_data/leds-kirkwood-ns2.h    |   26 +++
 include/linux/platform_data/leds-s3c24xx.h         |   28 ++++
 include/linux/platform_data/mfd-mcp-sa11x0.h       |   22 +++
 include/linux/platform_data/mipi-csis.h            |   43 +++++
 include/linux/platform_data/mmc-davinci.h          |   39 +++++
 include/linux/platform_data/mmc-esdhc-imx.h        |   43 +++++
 include/linux/platform_data/mmc-msm_sdcc.h         |   30 ++++
 include/linux/platform_data/mmc-mvsdio.h           |   20 +++
 include/linux/platform_data/mmc-mxcmmc.h           |   39 +++++
 include/linux/platform_data/mmc-pxamci.h           |   28 ++++
 include/linux/platform_data/mmc-s3cmci.h           |   52 ++++++
 include/linux/platform_data/mmc-sdhci-tegra.h      |   30 ++++
 include/linux/platform_data/mouse-pxa930_trkball.h |   10 ++
 include/linux/platform_data/mtd-davinci-aemif.h    |   36 ++++
 include/linux/platform_data/mtd-davinci.h          |   90 ++++++++++
 include/linux/platform_data/mtd-mxc_nand.h         |   32 ++++
 include/linux/platform_data/mtd-nand-omap2.h       |   44 +++++
 include/linux/platform_data/mtd-nand-pxa3xx.h      |   79 +++++++++
 include/linux/platform_data/mtd-nand-s3c2410.h     |   67 ++++++++
 include/linux/platform_data/mtd-nomadik-nand.h     |   16 ++
 include/linux/platform_data/mtd-onenand-omap2.h    |   53 ++++++
 include/linux/platform_data/mtd-orion_nand.h       |   26 +++
 include/linux/platform_data/pcmcia-pxa2xx_viper.h  |   11 ++
 include/linux/platform_data/pinctrl-coh901.h       |   37 +++++
 include/linux/platform_data/remoteproc-omap.h      |   57 +++++++
 include/linux/platform_data/serial-imx.h           |   35 ++++
 include/linux/platform_data/smartreflex-omap.h     |   39 +++++
 include/linux/platform_data/spi-davinci.h          |   89 ++++++++++
 include/linux/platform_data/spi-ep93xx.h           |   29 ++++
 include/linux/platform_data/spi-imx.h              |   27 +++
 include/linux/platform_data/spi-nuc900.h           |   35 ++++
 include/linux/platform_data/spi-omap2-mcspi.h      |   23 +++
 include/linux/platform_data/spi-s3c64xx.h          |   68 ++++++++
 include/linux/platform_data/touchscreen-s3c2410.h  |   25 +++
 include/linux/platform_data/usb-davinci.h          |   59 +++++++
 include/linux/platform_data/usb-ehci-mxc.h         |   59 +++++++
 include/linux/platform_data/usb-ehci-orion.h       |   26 +++
 include/linux/platform_data/usb-ehci-s5p.h         |   21 +++
 include/linux/platform_data/usb-exynos.h           |   21 +++
 include/linux/platform_data/usb-imx_udc.h          |   23 +++
 include/linux/platform_data/usb-musb-ux500.h       |   25 +++
 include/linux/platform_data/usb-mx2.h              |   38 +++++
 include/linux/platform_data/usb-ohci-pxa27x.h      |   36 ++++
 include/linux/platform_data/usb-ohci-s3c2410.h     |   43 +++++
 include/linux/platform_data/usb-pxa3xx-ulpi.h      |   35 ++++
 include/linux/platform_data/usb-s3c2410_udc.h      |   44 +++++
 include/linux/platform_data/video-ep93xx.h         |   56 +++++++
 include/linux/platform_data/video-imxfb.h          |   84 ++++++++++
 include/linux/platform_data/video-msm_fb.h         |  147 ++++++++++++++++
 include/linux/platform_data/video-mx3fb.h          |   53 ++++++
 include/linux/platform_data/video-nuc900fb.h       |   83 ++++++++++
 include/linux/platform_data/video-pxafb.h          |  175 ++++++++++++++++++++
 include/linux/platform_data/video-vt8500lcdfb.h    |   31 ++++
 include/linux/power/smartreflex.h                  |    2 +-
 sound/soc/davinci/davinci-evm.c                    |    2 +-
 sound/soc/davinci/davinci-i2s.c                    |    2 +-
 sound/soc/davinci/davinci-mcasp.h                  |    2 +-
 sound/soc/davinci/davinci-pcm.h                    |    2 +-
 sound/soc/ep93xx/ep93xx-ac97.c                     |    2 +-
 sound/soc/ep93xx/ep93xx-i2s.c                      |    2 +-
 sound/soc/ep93xx/ep93xx-pcm.c                      |    2 +-
 sound/soc/fsl/imx-pcm-dma.c                        |    2 +-
 sound/soc/fsl/imx-pcm-fiq.c                        |    2 +-
 sound/soc/fsl/imx-ssi.c                            |    2 +-
 sound/soc/fsl/imx-ssi.h                            |    2 +-
 sound/soc/kirkwood/kirkwood-i2s.c                  |    2 +-
 sound/soc/kirkwood/kirkwood-openrd.c               |    2 +-
 sound/soc/kirkwood/kirkwood-t5325.c                |    2 +-
 sound/soc/omap/am3517evm.c                         |    2 +-
 sound/soc/omap/ams-delta.c                         |    2 +-
 sound/soc/omap/igep0020.c                          |    2 +-
 sound/soc/omap/mcbsp.c                             |    2 +-
 sound/soc/omap/n810.c                              |    2 +-
 sound/soc/omap/omap-mcbsp.c                        |    2 +-
 sound/soc/omap/omap3beagle.c                       |    2 +-
 sound/soc/omap/omap3evm.c                          |    2 +-
 sound/soc/omap/omap3pandora.c                      |    2 +-
 sound/soc/omap/osk5912.c                           |    2 +-
 sound/soc/omap/overo.c                             |    2 +-
 sound/soc/omap/rx51.c                              |    2 +-
 sound/soc/omap/sdp3430.c                           |    2 +-
 sound/soc/omap/zoom2.c                             |    2 +-
 sound/soc/pxa/palm27x.c                            |    2 +-
 sound/soc/samsung/ac97.c                           |    2 +-
 sound/soc/samsung/i2s.c                            |    2 +-
 sound/soc/samsung/pcm.c                            |    2 +-
 sound/soc/samsung/s3c24xx_simtec.c                 |    2 +-
 sound/soc/samsung/spdif.c                          |    2 +-
 sound/soc/tegra/tegra_wm8903.c                     |    2 +-
 587 files changed, 4882 insertions(+), 4882 deletions(-)
 delete mode 100644 arch/arm/mach-at91/include/mach/at_hdmac.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/aemif.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/asp.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/i2c.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/keyscan.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/mmc.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/nand.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/spi.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/usb.h
 delete mode 100644 arch/arm/mach-ep93xx/include/mach/dma.h
 delete mode 100644 arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
 delete mode 100644 arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h
 delete mode 100644 arch/arm/mach-ep93xx/include/mach/fb.h
 delete mode 100644 arch/arm/mach-exynos/include/mach/ohci.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/leds-netxbig.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/leds-ns2.h
 delete mode 100644 arch/arm/mach-mmp/include/mach/sram.h
 delete mode 100644 arch/arm/mach-msm/include/mach/mmc.h
 delete mode 100644 arch/arm/mach-msm/include/mach/msm_fb.h
 delete mode 100644 arch/arm/mach-netx/include/mach/eth.h
 delete mode 100644 arch/arm/mach-nomadik/include/mach/nand.h
 delete mode 100644 arch/arm/mach-pxa/include/mach/arcom-pcmcia.h
 delete mode 100644 arch/arm/mach-pxa/include/mach/camera.h
 delete mode 100644 arch/arm/mach-pxa/include/mach/irda.h
 delete mode 100644 arch/arm/mach-pxa/include/mach/mmc.h
 delete mode 100644 arch/arm/mach-pxa/include/mach/ohci.h
 delete mode 100644 arch/arm/mach-pxa/include/mach/palmasoc.h
 delete mode 100644 arch/arm/mach-pxa/include/mach/pata_pxa.h
 delete mode 100644 arch/arm/mach-pxa/include/mach/pxa3xx-u2d.h
 delete mode 100644 arch/arm/mach-pxa/include/mach/pxa930_rotary.h
 delete mode 100644 arch/arm/mach-pxa/include/mach/pxa930_trkball.h
 delete mode 100644 arch/arm/mach-pxa/include/mach/pxafb.h
 delete mode 100644 arch/arm/mach-s3c24xx/include/mach/leds-gpio.h
 delete mode 100644 arch/arm/mach-sa1100/include/mach/mcp.h
 delete mode 100644 arch/arm/mach-tegra/include/mach/kbc.h
 delete mode 100644 arch/arm/mach-tegra/include/mach/sdhci.h
 delete mode 100644 arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
 delete mode 100644 arch/arm/mach-u300/include/mach/gpio-u300.h
 delete mode 100644 arch/arm/mach-ux500/include/mach/crypto-ux500.h
 delete mode 100644 arch/arm/mach-ux500/include/mach/usb.h
 delete mode 100644 arch/arm/mach-vt8500/include/mach/vt8500fb.h
 delete mode 100644 arch/arm/mach-w90x900/include/mach/fb.h
 delete mode 100644 arch/arm/mach-w90x900/include/mach/i2c.h
 delete mode 100644 arch/arm/mach-w90x900/include/mach/nuc900_spi.h
 delete mode 100644 arch/arm/mach-w90x900/include/mach/w90p910_keypad.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/dma.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/esdhc.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/i2c.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/imx-uart.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/imxfb.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/mmc.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/mx1_camera.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/mx21-usbhost.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/mx2_cam.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/mx3_camera.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/mx3fb.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/mxc_ehci.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/mxc_nand.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/sdma.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/spi.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/ssi.h
 delete mode 100644 arch/arm/plat-mxc/include/mach/usb.h
 delete mode 100644 arch/arm/plat-nomadik/include/plat/ske.h
 delete mode 100644 arch/arm/plat-omap/include/plat/dsp.h
 delete mode 100644 arch/arm/plat-omap/include/plat/keypad.h
 delete mode 100644 arch/arm/plat-omap/include/plat/lcd_mipid.h
 delete mode 100644 arch/arm/plat-omap/include/plat/mcbsp.h
 delete mode 100644 arch/arm/plat-omap/include/plat/mcspi.h
 delete mode 100644 arch/arm/plat-omap/include/plat/nand.h
 delete mode 100644 arch/arm/plat-omap/include/plat/onenand.h
 delete mode 100644 arch/arm/plat-omap/include/plat/remoteproc.h
 delete mode 100644 arch/arm/plat-omap/include/plat/voltage.h
 delete mode 100644 arch/arm/plat-orion/include/plat/audio.h
 delete mode 100644 arch/arm/plat-orion/include/plat/ehci-orion.h
 delete mode 100644 arch/arm/plat-orion/include/plat/mv_xor.h
 delete mode 100644 arch/arm/plat-orion/include/plat/mvsdio.h
 delete mode 100644 arch/arm/plat-orion/include/plat/orion_nand.h
 delete mode 100644 arch/arm/plat-pxa/include/plat/pxa27x_keypad.h
 delete mode 100644 arch/arm/plat-pxa/include/plat/pxa3xx_nand.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/ata.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/audio-simtec.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/audio.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/ehci.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/hwmon.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/iic.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/mci.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/mipi_csis.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/nand.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/s3c64xx-spi.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/ts.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/udc.h
 delete mode 100644 arch/arm/plat-samsung/include/plat/usb-control.h
 delete mode 100644 arch/arm/plat-spear/include/plat/keyboard.h
 create mode 100644 include/linux/platform_data/asoc-davinci-evm.h
 create mode 100644 include/linux/platform_data/asoc-imx-ssi.h
 create mode 100644 include/linux/platform_data/asoc-kirkwood.h
 create mode 100644 include/linux/platform_data/asoc-palm27x.h
 create mode 100644 include/linux/platform_data/asoc-s3c.h
 create mode 100644 include/linux/platform_data/asoc-s3c24xx_simtec.h
 create mode 100644 include/linux/platform_data/asoc-tegra_wm8903.h
 create mode 100644 include/linux/platform_data/ata-pxa.h
 create mode 100644 include/linux/platform_data/ata-samsung_cf.h
 create mode 100644 include/linux/platform_data/camera-mx1.h
 create mode 100644 include/linux/platform_data/camera-mx2.h
 create mode 100644 include/linux/platform_data/camera-mx3.h
 create mode 100644 include/linux/platform_data/camera-pxa.h
 create mode 100644 include/linux/platform_data/crypto-ux500.h
 create mode 100644 include/linux/platform_data/dma-atmel.h
 create mode 100644 include/linux/platform_data/dma-ep93xx.h
 create mode 100644 include/linux/platform_data/dma-imx-sdma.h
 create mode 100644 include/linux/platform_data/dma-imx.h
 create mode 100644 include/linux/platform_data/dma-mmp_tdma.h
 create mode 100644 include/linux/platform_data/dma-mv_xor.h
 create mode 100644 include/linux/platform_data/dsp-mcbsp.h
 create mode 100644 include/linux/platform_data/dsp-omap.h
 create mode 100644 include/linux/platform_data/eth-netx.h
 create mode 100644 include/linux/platform_data/hwmon-s3c.h
 create mode 100644 include/linux/platform_data/i2c-davinci.h
 create mode 100644 include/linux/platform_data/i2c-imx.h
 create mode 100644 include/linux/platform_data/i2c-nuc900.h
 create mode 100644 include/linux/platform_data/i2c-s3c2410.h
 create mode 100644 include/linux/platform_data/irda-pxaficp.h
 create mode 100644 include/linux/platform_data/keyboard-pxa930_rotary.h
 create mode 100644 include/linux/platform_data/keyboard-spear.h
 create mode 100644 include/linux/platform_data/keyboard-tegra-kbc.h
 create mode 100644 include/linux/platform_data/keypad-ep93xx.h
 create mode 100644 include/linux/platform_data/keypad-nomadik-ske.h
 create mode 100644 include/linux/platform_data/keypad-omap.h
 create mode 100644 include/linux/platform_data/keypad-pxa27x.h
 create mode 100644 include/linux/platform_data/keypad-w90p910.h
 create mode 100644 include/linux/platform_data/keyscan-davinci.h
 create mode 100644 include/linux/platform_data/lcd-mipid.h
 create mode 100644 include/linux/platform_data/leds-kirkwood-netxbig.h
 create mode 100644 include/linux/platform_data/leds-kirkwood-ns2.h
 create mode 100644 include/linux/platform_data/leds-s3c24xx.h
 create mode 100644 include/linux/platform_data/mfd-mcp-sa11x0.h
 create mode 100644 include/linux/platform_data/mipi-csis.h
 create mode 100644 include/linux/platform_data/mmc-davinci.h
 create mode 100644 include/linux/platform_data/mmc-esdhc-imx.h
 create mode 100644 include/linux/platform_data/mmc-msm_sdcc.h
 create mode 100644 include/linux/platform_data/mmc-mvsdio.h
 create mode 100644 include/linux/platform_data/mmc-mxcmmc.h
 create mode 100644 include/linux/platform_data/mmc-pxamci.h
 create mode 100644 include/linux/platform_data/mmc-s3cmci.h
 create mode 100644 include/linux/platform_data/mmc-sdhci-tegra.h
 create mode 100644 include/linux/platform_data/mouse-pxa930_trkball.h
 create mode 100644 include/linux/platform_data/mtd-davinci-aemif.h
 create mode 100644 include/linux/platform_data/mtd-davinci.h
 create mode 100644 include/linux/platform_data/mtd-mxc_nand.h
 create mode 100644 include/linux/platform_data/mtd-nand-omap2.h
 create mode 100644 include/linux/platform_data/mtd-nand-pxa3xx.h
 create mode 100644 include/linux/platform_data/mtd-nand-s3c2410.h
 create mode 100644 include/linux/platform_data/mtd-nomadik-nand.h
 create mode 100644 include/linux/platform_data/mtd-onenand-omap2.h
 create mode 100644 include/linux/platform_data/mtd-orion_nand.h
 create mode 100644 include/linux/platform_data/pcmcia-pxa2xx_viper.h
 create mode 100644 include/linux/platform_data/pinctrl-coh901.h
 create mode 100644 include/linux/platform_data/remoteproc-omap.h
 create mode 100644 include/linux/platform_data/serial-imx.h
 create mode 100644 include/linux/platform_data/smartreflex-omap.h
 create mode 100644 include/linux/platform_data/spi-davinci.h
 create mode 100644 include/linux/platform_data/spi-ep93xx.h
 create mode 100644 include/linux/platform_data/spi-imx.h
 create mode 100644 include/linux/platform_data/spi-nuc900.h
 create mode 100644 include/linux/platform_data/spi-omap2-mcspi.h
 create mode 100644 include/linux/platform_data/spi-s3c64xx.h
 create mode 100644 include/linux/platform_data/touchscreen-s3c2410.h
 create mode 100644 include/linux/platform_data/usb-davinci.h
 create mode 100644 include/linux/platform_data/usb-ehci-mxc.h
 create mode 100644 include/linux/platform_data/usb-ehci-orion.h
 create mode 100644 include/linux/platform_data/usb-ehci-s5p.h
 create mode 100644 include/linux/platform_data/usb-exynos.h
 create mode 100644 include/linux/platform_data/usb-imx_udc.h
 create mode 100644 include/linux/platform_data/usb-musb-ux500.h
 create mode 100644 include/linux/platform_data/usb-mx2.h
 create mode 100644 include/linux/platform_data/usb-ohci-pxa27x.h
 create mode 100644 include/linux/platform_data/usb-ohci-s3c2410.h
 create mode 100644 include/linux/platform_data/usb-pxa3xx-ulpi.h
 create mode 100644 include/linux/platform_data/usb-s3c2410_udc.h
 create mode 100644 include/linux/platform_data/video-ep93xx.h
 create mode 100644 include/linux/platform_data/video-imxfb.h
 create mode 100644 include/linux/platform_data/video-msm_fb.h
 create mode 100644 include/linux/platform_data/video-mx3fb.h
 create mode 100644 include/linux/platform_data/video-nuc900fb.h
 create mode 100644 include/linux/platform_data/video-pxafb.h
 create mode 100644 include/linux/platform_data/video-vt8500lcdfb.h

Cc: netdev@vger.kernel.org
Cc: openezx-devel@lists.openezx.org
Cc: spear-devel@list.st.com
Cc: davinci-linux-open-source@linux.davincidsp.com
Cc: linux-arm-msm@vger.kernel.org
Cc: linux-omap@vger.kernel.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-tegra@vger.kernel.org
Bcc: "Ben Dooks" <ben-linux@fluff.org>
Bcc: "Benoît Cousson" <b-cousson@ti.com>
Bcc: "David S. Miller" <davem@davemloft.net>
Bcc: "Wolfram Sang" <w.sang@pengutronix.de>
Bcc: Alan Cox <alan@linux.intel.com>
Bcc: Alan Stern <stern@rowland.harvard.edu>
Bcc: Alessandro Rubini <rubini@unipv.it>
Bcc: Andreas Westin <andreas.westin@stericsson.com>
Bcc: Andrew Lunn <andrew@lunn.ch>
Bcc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Bcc: Axel Lin <axel.lin@gmail.com>
Bcc: Ben Dooks <ben-linux@fluff.org>
Bcc: Bryan Huntsman <bryanh@codeaurora.org>
Bcc: Bryan Wu <bryan.wu@canonical.com>
Bcc: Chris Ball <cjb@laptop.org>
Bcc: Colin Cross <ccross@android.com>
Bcc: Dan Williams <djbw@fb.com>
Bcc: Daniel Ribeiro <drwyrm@gmail.com>
Bcc: Daniel Walker <dwalker@fifo99.com>
Bcc: David Brown <davidb@codeaurora.org>
Bcc: David Woodhouse <dwmw2@infradead.org>
Bcc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Bcc: Eric Miao <eric.y.miao@gmail.com>
Bcc: Felipe Balbi <balbi@ti.com>
Bcc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Bcc: Grant Likely <grant.likely@secretlab.ca>
Bcc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bcc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Bcc: Guenter Roeck <linux@roeck-us.net>
Bcc: Haojian Zhuang <haojian.zhuang@gmail.com>
Bcc: Harald Welte <laforge@openezx.org>
Bcc: Hartley Sweeten <hsweeten@visionengravers.com>
Bcc: Herbert Xu <herbert@gondor.apana.org.au>
Bcc: J Keerthy <j-keerthy@ti.com>
Bcc: Jarkko Nikula <jarkko.nikula@bitmer.com>
Bcc: Jaroslav Kysela <perex@perex.cz>
Bcc: Jason Cooper <jason@lakedaemon.net>
Bcc: Javier Martin <javier.martin@vista-silicon.com>
Bcc: Jean Pihet <j-pihet@ti.com>
Bcc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Bcc: Jeff Garzik <jgarzik@pobox.com>
Bcc: Jochen Friedrich <jochen@scram.de>
Bcc: Jonathan Cameron <jic23@cam.ac.uk>
Bcc: Kevin Hilman <khilman@ti.com>
Bcc: Kukjin Kim <kgene.kim@samsung.com>
Bcc: Kyungmin Park <kyungmin.park@samsung.com>
Bcc: Liam Girdwood <lrg@ti.com>
Bcc: Linus Walleij <linus.walleij@linaro.org>
Bcc: Marek Vasut <marek.vasut@gmail.com>
Bcc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Bcc: Mauro Carvalho Chehab <mchehab@infradead.org>
Bcc: Mika Westerberg <mika.westerberg@iki.fi>
Bcc: Nicolas Ferre <nicolas.ferre@atmel.com>
Bcc: Nicolas Pitre <nico@fluxnic.net>
Bcc: Ohad Ben-Cohen <ohad@wizery.com>
Bcc: Olof Johansson <olof@lixom.net>
Bcc: Omar Ramirez Luna <omar.ramirez@ti.com>
Bcc: Paul Parsons <lost.distance@yahoo.com>
Bcc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Bcc: Philipp Zabel <philipp.zabel@gmail.com>
Bcc: Richard Purdie <rpurdie@rpsys.net>
Bcc: Robert Jarzmik <robert.jarzmik@free.fr>
Bcc: Russell King <linux@arm.linux.org.uk>
Bcc: Ryan Mallon <rmallon@gmail.com>
Bcc: STEricsson <STEricsson_nomadik_linux@list.st.com>
Bcc: Samuel Ortiz <samuel@sortiz.org>
Bcc: Sangbeom Kim <sbkim73@samsung.com>
Bcc: Sascha Hauer <s.hauer@pengutronix.de>
Bcc: Sekhar Nori <nsekhar@ti.com>
Bcc: Sergey Lapin <slapin@ossfans.org>
Bcc: Shawn Guo <shawn.guo@linaro.org>
Bcc: Shiraz Hashim <shiraz.hashim@st.com>
Bcc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Bcc: Stefan Schmidt <stefan@openezx.org>
Bcc: Stephen Warren <swarren@wwwdotorg.org>
Bcc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Bcc: Takashi Iwai <tiwai@suse.de>
Bcc: Tomas Cech <sleep_walker@suse.cz>
Bcc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Bcc: Tony Lindgren <tony@atomide.com>
Bcc: Tony Prisk <linux@prisktech.co.nz>
Bcc: Vinod Koul <vinod.koul@intel.com>
Bcc: Viresh Kumar <viresh.linux@gmail.com>
Bcc: Wan ZongShun <mcuos.com@gmail.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 05/16] ARM: msm: move platform_data definitions
       [not found]   ` <1347368390-31252-1-git-send-email-arnd@arndb.de>
@ 2012-09-11 12:59     ` Arnd Bergmann
  2012-09-11 21:07       ` David Brown
  0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2012-09-11 12:59 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Russell King, Arnd Bergmann, Florian Tobias Schandinat,
	linux-arm-msm, linux-kernel, Bryan Huntsman, Daniel Walker,
	David Brown, Chris Ball

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

This moves such data out of the msm include directories

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: David Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Cc: Chris Ball <cjb@laptop.org>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: linux-arm-msm@vger.kernel.org
---
 arch/arm/mach-msm/board-qsd8x50.c                                    |    2 +-
 arch/arm/mach-msm/board-trout-mmc.c                                  |    2 +-
 arch/arm/mach-msm/board-trout-panel.c                                |    2 +-
 arch/arm/mach-msm/devices-msm7x00.c                                  |    2 +-
 arch/arm/mach-msm/devices-msm7x30.c                                  |    2 +-
 arch/arm/mach-msm/devices-qsd8x50.c                                  |    2 +-
 arch/arm/mach-msm/include/mach/board.h                               |    2 +-
 drivers/mmc/host/msm_sdcc.c                                          |    2 +-
 drivers/video/msm/mddi.c                                             |    2 +-
 drivers/video/msm/mddi_client_dummy.c                                |    2 +-
 drivers/video/msm/mddi_client_nt35399.c                              |    2 +-
 drivers/video/msm/mddi_client_toshiba.c                              |    2 +-
 drivers/video/msm/mdp.c                                              |    2 +-
 drivers/video/msm/mdp_hw.h                                           |    2 +-
 drivers/video/msm/mdp_ppp.c                                          |    2 +-
 drivers/video/msm/msm_fb.c                                           |    2 +-
 .../include/mach/mmc.h => include/linux/platform_data/mmc-msm_sdcc.h |    0
 .../mach/msm_fb.h => include/linux/platform_data/video-msm_fb.h      |    0
 18 files changed, 16 insertions(+), 16 deletions(-)
 rename arch/arm/mach-msm/include/mach/mmc.h => include/linux/platform_data/mmc-msm_sdcc.h (100%)
 rename arch/arm/mach-msm/include/mach/msm_fb.h => include/linux/platform_data/video-msm_fb.h (100%)

diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
index c8fe0ed..b21bb4c 100644
--- a/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@ -32,7 +32,7 @@
 #include <mach/irqs.h>
 #include <mach/sirc.h>
 #include <mach/vreg.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-msm_sdcc.h>
 
 #include "devices.h"
 
diff --git a/arch/arm/mach-msm/board-trout-mmc.c b/arch/arm/mach-msm/board-trout-mmc.c
index 8650342..3723e55 100644
--- a/arch/arm/mach-msm/board-trout-mmc.c
+++ b/arch/arm/mach-msm/board-trout-mmc.c
@@ -15,7 +15,7 @@
 
 #include <mach/vreg.h>
 
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-msm_sdcc.h>
 
 #include "devices.h"
 
diff --git a/arch/arm/mach-msm/board-trout-panel.c b/arch/arm/mach-msm/board-trout-panel.c
index 89bf6b4..f9a5db6 100644
--- a/arch/arm/mach-msm/board-trout-panel.c
+++ b/arch/arm/mach-msm/board-trout-panel.c
@@ -14,7 +14,7 @@
 #include <asm/mach-types.h>
 #include <asm/system_info.h>
 
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
 #include <mach/vreg.h>
 
 #include "board-trout.h"
diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c
index 993780f..f66ee6e 100644
--- a/arch/arm/mach-msm/devices-msm7x00.c
+++ b/arch/arm/mach-msm/devices-msm7x00.c
@@ -27,7 +27,7 @@
 
 #include "clock.h"
 #include "clock-pcom.h"
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-msm_sdcc.h>
 
 static struct resource resources_uart1[] = {
 	{
diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c
index 09b4f14..e90ab59 100644
--- a/arch/arm/mach-msm/devices-msm7x30.c
+++ b/arch/arm/mach-msm/devices-msm7x30.c
@@ -31,7 +31,7 @@
 #include "clock-pcom.h"
 #include "clock-7x30.h"
 
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-msm_sdcc.h>
 
 static struct resource resources_uart2[] = {
 	{
diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
index 131633b..4db61d5 100644
--- a/arch/arm/mach-msm/devices-qsd8x50.c
+++ b/arch/arm/mach-msm/devices-qsd8x50.c
@@ -27,7 +27,7 @@
 
 #include <asm/mach/flash.h>
 
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-msm_sdcc.h>
 #include "clock-pcom.h"
 
 static struct resource resources_uart3[] = {
diff --git a/arch/arm/mach-msm/include/mach/board.h b/arch/arm/mach-msm/include/mach/board.h
index 435f8ed..70e0f98 100644
--- a/arch/arm/mach-msm/include/mach/board.h
+++ b/arch/arm/mach-msm/include/mach/board.h
@@ -18,7 +18,7 @@
 #define __ASM_ARCH_MSM_BOARD_H
 
 #include <linux/types.h>
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-msm_sdcc.h>
 
 /* platform device data structures */
 
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 1d14cda..7c0af0e 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -42,7 +42,7 @@
 #include <asm/div64.h>
 #include <asm/sizes.h>
 
-#include <mach/mmc.h>
+#include <linux/platform_data/mmc-msm_sdcc.h>
 #include <mach/msm_iomap.h>
 #include <mach/dma.h>
 #include <mach/clk.h>
diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c
index b061d70..bf73f04 100644
--- a/drivers/video/msm/mddi.c
+++ b/drivers/video/msm/mddi.c
@@ -29,7 +29,7 @@
 #include <mach/msm_iomap.h>
 #include <mach/irqs.h>
 #include <mach/board.h>
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
 #include "mddi_hw.h"
 
 #define FLAG_DISABLE_HIBERNATION 0x0001
diff --git a/drivers/video/msm/mddi_client_dummy.c b/drivers/video/msm/mddi_client_dummy.c
index d2a091c..f1b0dfc 100644
--- a/drivers/video/msm/mddi_client_dummy.c
+++ b/drivers/video/msm/mddi_client_dummy.c
@@ -20,7 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
 
 struct panel_info {
 	struct platform_device pdev;
diff --git a/drivers/video/msm/mddi_client_nt35399.c b/drivers/video/msm/mddi_client_nt35399.c
index 7fcd67e..d7a5bf8 100644
--- a/drivers/video/msm/mddi_client_nt35399.c
+++ b/drivers/video/msm/mddi_client_nt35399.c
@@ -22,7 +22,7 @@
 #include <linux/sched.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
 
 static DECLARE_WAIT_QUEUE_HEAD(nt35399_vsync_wait);
 
diff --git a/drivers/video/msm/mddi_client_toshiba.c b/drivers/video/msm/mddi_client_toshiba.c
index 053eb68..061d7df 100644
--- a/drivers/video/msm/mddi_client_toshiba.c
+++ b/drivers/video/msm/mddi_client_toshiba.c
@@ -22,7 +22,7 @@
 #include <linux/gpio.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
 
 
 #define LCD_CONTROL_BLOCK_BASE 0x110000
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index cb2ddf1..d1f881e 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -26,7 +26,7 @@
 #include <linux/slab.h>
 
 #include <mach/msm_iomap.h>
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
 #include <linux/platform_device.h>
 #include <linux/export.h>
 
diff --git a/drivers/video/msm/mdp_hw.h b/drivers/video/msm/mdp_hw.h
index d804774..a0bacf5 100644
--- a/drivers/video/msm/mdp_hw.h
+++ b/drivers/video/msm/mdp_hw.h
@@ -16,7 +16,7 @@
 #define _MDP_HW_H_
 
 #include <mach/msm_iomap.h>
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
 
 struct mdp_info {
 	struct mdp_device mdp_dev;
diff --git a/drivers/video/msm/mdp_ppp.c b/drivers/video/msm/mdp_ppp.c
index 2b6564e..be6079c 100644
--- a/drivers/video/msm/mdp_ppp.c
+++ b/drivers/video/msm/mdp_ppp.c
@@ -16,7 +16,7 @@
 #include <linux/file.h>
 #include <linux/delay.h>
 #include <linux/msm_mdp.h>
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
 
 #include "mdp_hw.h"
 #include "mdp_scale_tables.h"
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
index c6e3b4f..ec08a9e 100644
--- a/drivers/video/msm/msm_fb.c
+++ b/drivers/video/msm/msm_fb.c
@@ -25,7 +25,7 @@
 #include <linux/msm_mdp.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
-#include <mach/msm_fb.h>
+#include <linux/platform_data/video-msm_fb.h>
 #include <mach/board.h>
 #include <linux/workqueue.h>
 #include <linux/clk.h>
diff --git a/arch/arm/mach-msm/include/mach/mmc.h b/include/linux/platform_data/mmc-msm_sdcc.h
similarity index 100%
rename from arch/arm/mach-msm/include/mach/mmc.h
rename to include/linux/platform_data/mmc-msm_sdcc.h
diff --git a/arch/arm/mach-msm/include/mach/msm_fb.h b/include/linux/platform_data/video-msm_fb.h
similarity index 100%
rename from arch/arm/mach-msm/include/mach/msm_fb.h
rename to include/linux/platform_data/video-msm_fb.h
-- 
1.7.10

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH 05/16] ARM: msm: move platform_data definitions
  2012-09-11 12:59     ` [PATCH 05/16] ARM: msm: move platform_data definitions Arnd Bergmann
@ 2012-09-11 21:07       ` David Brown
  0 siblings, 0 replies; 3+ messages in thread
From: David Brown @ 2012-09-11 21:07 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: linux-arm-kernel, linux-kernel, Russell King, Daniel Walker,
	Bryan Huntsman, Chris Ball, Florian Tobias Schandinat,
	linux-arm-msm

On Tue, Sep 11, 2012 at 02:59:39PM +0200, Arnd Bergmann wrote:
> Platform data for device drivers should be defined in
> include/linux/platform_data/*.h, not in the architecture
> and platform specific directories.
> 
> This moves such data out of the msm include directories
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: David Brown <davidb@codeaurora.org>
> Cc: Daniel Walker <dwalker@fifo99.com>
> Cc: Bryan Huntsman <bryanh@codeaurora.org>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
> Cc: linux-arm-msm@vger.kernel.org
> ---
>  arch/arm/mach-msm/board-qsd8x50.c                                    |    2 +-
>  arch/arm/mach-msm/board-trout-mmc.c                                  |    2 +-
>  arch/arm/mach-msm/board-trout-panel.c                                |    2 +-
>  arch/arm/mach-msm/devices-msm7x00.c                                  |    2 +-
>  arch/arm/mach-msm/devices-msm7x30.c                                  |    2 +-
>  arch/arm/mach-msm/devices-qsd8x50.c                                  |    2 +-
>  arch/arm/mach-msm/include/mach/board.h                               |    2 +-
>  drivers/mmc/host/msm_sdcc.c                                          |    2 +-
>  drivers/video/msm/mddi.c                                             |    2 +-
>  drivers/video/msm/mddi_client_dummy.c                                |    2 +-
>  drivers/video/msm/mddi_client_nt35399.c                              |    2 +-
>  drivers/video/msm/mddi_client_toshiba.c                              |    2 +-
>  drivers/video/msm/mdp.c                                              |    2 +-
>  drivers/video/msm/mdp_hw.h                                           |    2 +-
>  drivers/video/msm/mdp_ppp.c                                          |    2 +-
>  drivers/video/msm/msm_fb.c                                           |    2 +-
>  .../include/mach/mmc.h => include/linux/platform_data/mmc-msm_sdcc.h |    0
>  .../mach/msm_fb.h => include/linux/platform_data/video-msm_fb.h      |    0
>  18 files changed, 16 insertions(+), 16 deletions(-)
>  rename arch/arm/mach-msm/include/mach/mmc.h => include/linux/platform_data/mmc-msm_sdcc.h (100%)
>  rename arch/arm/mach-msm/include/mach/msm_fb.h => include/linux/platform_data/video-msm_fb.h (100%)

Acked-by: David Brown <davidb@codeaurora.org>

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-09-11 21:07 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <1347368245-30989-1-git-send-email-arnd@arndb.de>
2012-09-11 12:59 ` [PATCH 00/16] ARM: big platform data header rename Arnd Bergmann
     [not found]   ` <1347368390-31252-1-git-send-email-arnd@arndb.de>
2012-09-11 12:59     ` [PATCH 05/16] ARM: msm: move platform_data definitions Arnd Bergmann
2012-09-11 21:07       ` David Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).