Patchwork [GIT,PULL,V5,5/7] ARM: kirkwood platform_data changes for v3.7

login
register
mail settings
Submitter Jason
Date Sept. 22, 2012, 5:31 p.m.
Message ID <20120922173145.GJ5469@titan.lakedaemon.net>
Download mbox
Permalink /patch/186413/
State New
Headers show

Pull-request

git://git.infradead.org/users/jcooper/linux.git kirkwood/platform_data

Comments

Jason - Sept. 22, 2012, 5:31 p.m.
Note: This may conflict with work Rob Herring and others are doing
regarding platform_data conversion.  If so, just drop this branch.
Nothing depends on it, intentionally ;-)

Depends:
 - Based on v3.6-rc5
 - Depends on branches:
    - kirkwood/cleanup which depends on:
       - kirkwood/dt
    - kirkwood/boards

Misc:
 - move kirkwood/orion headers to platform_data

The following changes since commit 1265d613af1a25f44119bfb03b2bff9c665977ba:   

  Merge branch 'kirkwood/boards' into kirkwood/platform_data (2012-09-22 15:53:21 +0000)

are available in the git repository at:

  git://git.infradead.org/users/jcooper/linux.git kirkwood/platform_data

Jason Cooper (2):
      ARM: Kirkwood: board-dockstar: use linux/platform_data/mvsdio.h instead of plat/mvsdio.h
      ARM: Kirkwood: use linux/platform_data/mv643xx.h instead of linux/mv643xx.h

Thomas Petazzoni (8):
      sound: kirkwood: remove useless <plat/audio.h> include
      sound: kirkwood: move <plat/audio.h> to <linux/platform_data/kirkwood-audio.h>  
      usb: ehci-orion: move <plat/ehci-orion.h> to <linux/platform_data/ehci-orion.h> 
      mmc: mvsdio: move <plat/mvsdio.h> to <linux/platform_data/mvsdio.h>
      dma: mv_xor: move <plat/mv_xor.h> to <linux/platform_data/mv_xor.h>
      mtd: orion_nand: move <plat/orion_nand.h> to <linux/platform_data/orion_nand.h> 
      i2c: mv643xx: move <linux/mv643xx_i2c.h> to <linux/platform_data/mv643xx_i2c.h> 
      net: mv643xx_eth: move <linux/mv643xx_eth.h> to <linux/platform_data/mv643xx_eth.h>

 arch/arm/mach-dove/cm-a510.c                       |    2 +-
 arch/arm/mach-dove/common.c                        |    2 +-
 arch/arm/mach-dove/dove-db-setup.c                 |    2 +-
 arch/arm/mach-kirkwood/board-dnskw.c               |    2 +-
 arch/arm/mach-kirkwood/board-dockstar.c            |    4 ++--
 arch/arm/mach-kirkwood/board-dreamplug.c           |    4 ++--
 arch/arm/mach-kirkwood/board-goflexnet.c           |    4 ++--
 arch/arm/mach-kirkwood/board-ib62x0.c              |    2 +-
 arch/arm/mach-kirkwood/board-iconnect.c            |    3 ++-
 arch/arm/mach-kirkwood/board-iomega_ix2_200.c      |    2 +-
 arch/arm/mach-kirkwood/board-km_kirkwood.c         |    2 +-
 arch/arm/mach-kirkwood/board-lsxl.c                |    2 +-
 arch/arm/mach-kirkwood/board-ts219.c               |    2 +-
 arch/arm/mach-kirkwood/common.c                    |   12 ++++++------
 arch/arm/mach-kirkwood/d2net_v2-setup.c            |    2 +-
 arch/arm/mach-kirkwood/db88f6281-bp-setup.c        |    4 ++--
 arch/arm/mach-kirkwood/dockstar-setup.c            |    4 ++--
 arch/arm/mach-kirkwood/guruplug-setup.c            |    4 ++--
 arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c     |    2 +-
 arch/arm/mach-kirkwood/netspace_v2-setup.c         |    2 +-
 arch/arm/mach-kirkwood/netxbig_v2-setup.c          |    2 +-
 arch/arm/mach-kirkwood/openrd-setup.c              |    4 ++--
 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c       |    2 +-
 arch/arm/mach-kirkwood/rd88f6281-setup.c           |    4 ++--
 arch/arm/mach-kirkwood/sheevaplug-setup.c          |    4 ++--
 arch/arm/mach-kirkwood/t5325-setup.c               |    2 +-
 arch/arm/mach-kirkwood/ts219-setup.c               |    2 +-
 arch/arm/mach-kirkwood/ts41x-setup.c               |    2 +-
 arch/arm/mach-mv78xx0/buffalo-wxl-setup.c          |    2 +-
 arch/arm/mach-mv78xx0/common.c                     |    4 ++--
 arch/arm/mach-mv78xx0/db78x00-bp-setup.c           |    2 +-
 arch/arm/mach-mv78xx0/rd78x00-masa-setup.c         |    2 +-
 arch/arm/mach-orion5x/common.c                     |    6 +++---
 arch/arm/mach-orion5x/d2net-setup.c                |    2 +-
 arch/arm/mach-orion5x/db88f5281-setup.c            |    4 ++--
 arch/arm/mach-orion5x/dns323-setup.c               |    2 +-
 arch/arm/mach-orion5x/edmini_v2-setup.c            |    2 +-
 arch/arm/mach-orion5x/kurobox_pro-setup.c          |    4 ++--
 arch/arm/mach-orion5x/ls-chl-setup.c               |    2 +-
 arch/arm/mach-orion5x/ls_hgl-setup.c               |    2 +-
 arch/arm/mach-orion5x/lsmini-setup.c               |    2 +-
 arch/arm/mach-orion5x/mss2-setup.c                 |    2 +-
 arch/arm/mach-orion5x/mv2120-setup.c               |    2 +-
 arch/arm/mach-orion5x/net2big-setup.c              |    2 +-
 arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c       |    2 +-
 arch/arm/mach-orion5x/rd88f5181l-ge-setup.c        |    2 +-
 arch/arm/mach-orion5x/rd88f5182-setup.c            |    2 +-
 arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c       |    2 +-
 arch/arm/mach-orion5x/terastation_pro2-setup.c     |    2 +-
 arch/arm/mach-orion5x/ts209-setup.c                |    2 +-
 arch/arm/mach-orion5x/ts409-setup.c                |    2 +-
 arch/arm/mach-orion5x/ts78xx-setup.c               |    2 +-
 arch/arm/mach-orion5x/tsx09-common.c               |    2 +-
 arch/arm/mach-orion5x/wnr854t-setup.c              |    2 +-
 arch/arm/mach-orion5x/wrt350n-v2-setup.c           |    2 +-
 arch/arm/plat-orion/common.c                       |    8 ++++----
 arch/arm/plat-orion/include/plat/audio.h           |    7 -------
 arch/arm/plat-orion/include/plat/common.h          |    2 +-
 drivers/dma/mv_xor.c                               |    2 +-
 drivers/i2c/busses/i2c-mv64xxx.c                   |    2 +-
 drivers/mmc/host/mvsdio.c                          |    2 +-
 drivers/mtd/nand/orion_nand.c                      |    2 +-
 drivers/net/ethernet/marvell/mv643xx_eth.c         |    2 +-
 drivers/usb/host/ehci-orion.c                      |    2 +-
 include/linux/mv643xx.h                            |    4 ++--
 .../linux/platform_data}/ehci-orion.h              |    6 ++----
 include/linux/platform_data/kirkwood-audio.h       |    7 +++++++
 include/linux/{ => platform_data}/mv643xx_eth.h    |    4 ++--
 include/linux/{ => platform_data}/mv643xx_i2c.h    |    4 ++--
 .../plat => include/linux/platform_data}/mv_xor.h  |    6 ++----
 .../plat => include/linux/platform_data}/mvsdio.h  |    6 ++----
 .../linux/platform_data}/orion_nand.h              |    6 ++----
 sound/soc/kirkwood/kirkwood-i2s.c                  |    2 +-
 sound/soc/kirkwood/kirkwood-openrd.c               |    1 -
 sound/soc/kirkwood/kirkwood-t5325.c                |    1 -
 75 files changed, 108 insertions(+), 117 deletions(-)
 delete mode 100644 arch/arm/plat-orion/include/plat/audio.h
 rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/ehci-orion.h (78%)
 create mode 100644 include/linux/platform_data/kirkwood-audio.h
 rename include/linux/{ => platform_data}/mv643xx_eth.h (96%)
 rename include/linux/{ => platform_data}/mv643xx_i2c.h (89%)
 rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mv_xor.h (77%)
 rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mvsdio.h (77%)
 rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/orion_nand.h (82%)