Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM soc multiplatform enablement from Olof Johansson:
 "This is a pretty significant branch.  It's the introduction of the
  first multiplatform support on ARM, and with this (and the later
  branch) merged, it is now possible to build one kernel that contains
  support for highbank, vexpress, mvebu, socfpga, and picoxcell.  More
  platforms will be convered over in the next few releases.

  Two critical last things had to be done for this to be practical and
  possible:
   * Today each platform has its own include directory under
     mach-<mach>/include/mach/*, and traditionally that is where a lot
     of driver/platform shared definitions have gone, such as platform
     data structures.  They now need to move out to a common location
     instead, and this branch moves a large number of those out to
     include/linux/platform_data.
   * Each platform used to list the device trees to compile for its
     boards in mach-<mach>/Makefile.boot.

  Both of the above changes will mean that there are some merge
  conflicts to come (and some to resolve here).  It's a one-time move
  and once it settles in, we should be good for quite a while.  Sorry
  for the overhead."

Fix conflicts as per Olof.

* tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits)
  ARM: add v7 multi-platform defconfig
  ARM: msm: Move core.h contents into common.h
  ARM: highbank: call highbank_pm_init from .init_machine
  ARM: dtb: move all dtb targets to common Makefile
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: vexpress: convert to multi-platform
  ARM: initial multiplatform support
  ARM: mvebu: move armada-370-xp.h in mach dir
  ARM: vexpress: remove dependency on mach/* headers
  ARM: picoxcell: remove dependency on mach/* headers
  ARM: move all dtb targets out of Makefile.boot
  ARM: picoxcell: move debug macros to include/debug
  ARM: socfpga: move debug macros to include/debug
  ARM: mvebu: move debug macros to include/debug
  ARM: vexpress: move debug macros to include/debug
  ARM: highbank: move debug macros to include/debug
  ARM: move debug macros to common location
  ARM: make mach/gpio.h headers optional
  ...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/boot/dts/Makefile
index 0000000,d302e66..43c084c
mode 000000,100644..100644
--- /dev/null
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -1,0 -1,100 +1,101 @@@
+ ifeq ($(CONFIG_OF),y)
+ 
+ dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb \
+       at91sam9263ek.dtb \
+       at91sam9g20ek_2mmc.dtb \
+       at91sam9g20ek.dtb \
+       at91sam9g25ek.dtb \
+       at91sam9m10g45ek.dtb \
+       at91sam9n12ek.dtb \
+       ethernut5.dtb \
+       evk-pro3.dtb \
+       kizbox.dtb \
+       tny_a9260.dtb \
+       tny_a9263.dtb \
+       tny_a9g20.dtb \
+       usb_a9260.dtb \
+       usb_a9263.dtb \
+       usb_a9g20.dtb
+ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
+ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
+       exynos4210-smdkv310.dtb \
++      exynos4210-trats.dtb \
+       exynos5250-smdk5250.dtb
+ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb
+ dtb-$(CONFIG_ARCH_IMX5) += imx51-babbage.dtb \
+       imx53-ard.dtb \
+       imx53-evk.dtb \
+       imx53-qsb.dtb \
+       imx53-smd.dtb
+ dtb-$(CONFIG_SOC_IMX6Q) += imx6q-arm2.dtb \
+       imx6q-sabrelite.dtb \
+       imx6q-sabresd.dtb
+ dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
+ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \
+       kirkwood-dns325.dtb \
+       kirkwood-dreamplug.dtb \
+       kirkwood-goflexnet.dtb \
+       kirkwood-ib62x0.dtb \
+       kirkwood-iconnect.dtb \
+       kirkwood-lschlv2.dtb \
+       kirkwood-lsxhl.dtb \
+       kirkwood-ts219-6281.dtb \
+       kirkwood-ts219-6282.dtb
+ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
+       msm8960-cdp.dtb
+ dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
+       armada-xp-db.dtb
+ dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
+       imx53-ard.dtb \
+       imx53-evk.dtb \
+       imx53-qsb.dtb \
+       imx53-smd.dtb \
+       imx6q-arm2.dtb \
+       imx6q-sabrelite.dtb \
+       imx6q-sabresd.dtb
+ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
+       imx23-olinuxino.dtb \
+       imx23-stmp378x_devb.dtb \
+       imx28-apx4devkit.dtb \
+       imx28-cfa10036.dtb \
+       imx28-cfa10049.dtb \
+       imx28-evk.dtb \
+       imx28-m28evk.dtb \
+       imx28-tx28.dtb
+ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
+       omap3-beagle-xm.dtb \
+       omap3-evm.dtb \
+       omap3-tobi.dtb \
+       omap4-panda.dtb \
+       omap4-pandaES.dtb \
+       omap4-var_som.dtb \
+       omap4-sdp.dtb \
+       omap5-evm.dtb
+ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
+ dtb-$(CONFIG_ARCH_U8500) += snowball.dtb
+ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
+       r8a7740-armadillo800eva.dtb \
+       sh73a0-kzm9g.dtb
+ dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
+       spear1340-evb.dtb
+ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \
+       spear310-evb.dtb \
+       spear320-evb.dtb
+ dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
+ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
+       tegra20-medcom-wide.dtb \
+       tegra20-paz00.dtb \
+       tegra20-plutux.dtb \
+       tegra20-seaboard.dtb \
+       tegra20-tec.dtb \
+       tegra20-trimslice.dtb \
+       tegra20-ventana.dtb \
+       tegra20-whistler.dtb \
+       tegra30-cardhu-a02.dtb \
+       tegra30-cardhu-a04.dtb
+ dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
+       vexpress-v2p-ca9.dtb \
+       vexpress-v2p-ca15-tc1.dtb \
+       vexpress-v2p-ca15_a7.dtb
+ 
+ endif

diff --cc arch/arm/mach-at91/at91sam9rl_devices.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-exynos5-dt.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-origen.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-smdk4x12.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-smdkv310.c
Simple merge

diff --cc arch/arm/mach-nomadik/board-nhk8815.c
Simple merge

diff --cc arch/arm/mach-omap2/board-4430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap4panda.c
Simple merge

diff --cc arch/arm/mach-orion5x/common.c
Simple merge

diff --cc arch/arm/mach-pxa/idp.c
Simple merge

diff --cc arch/arm/mach-pxa/lubbock.c
Simple merge

diff --cc arch/arm/mach-pxa/mainstone.c
Simple merge

diff --cc arch/arm/mach-pxa/stargate2.c
Simple merge

diff --cc arch/arm/mach-realview/core.h
Simple merge

diff --cc arch/arm/mach-realview/realview_pb11mp.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pbx.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-h1940.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-crag6410-module.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge

diff --cc arch/arm/mach-sa1100/assabet.c
Simple merge

diff --cc arch/arm/mach-sa1100/cerf.c
Simple merge

diff --cc arch/arm/mach-sa1100/lart.c
Simple merge

diff --cc arch/arm/mach-sa1100/simpad.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-ap4evb.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-g4evm.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-kzm9g.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-marzen.c
Simple merge

diff --cc arch/arm/mach-shmobile/sh-gpio.h
Simple merge

diff --cc arch/arm/mach-tegra/board-dt-tegra20.c
index c339444,5d8c8fb..57e235f
--- 1/arch/arm/mach-tegra/board-dt-tegra20.c
--- 2/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@@ -45,31 -43,9 +45,32 @@@
  
  #include "board.h"
  #include "clock.h"
 -#include "devices.h"
+ #include "common.h"
  
 +struct tegra_ehci_platform_data tegra_ehci1_pdata = {
 +      .operating_mode = TEGRA_USB_OTG,
 +      .power_down_on_bus_suspend = 1,
 +      .vbus_gpio = -1,
 +};
 +
 +struct tegra_ulpi_config tegra_ehci2_ulpi_phy_config = {
 +      .reset_gpio = -1,
 +      .clk = "cdev2",
 +};
 +
 +struct tegra_ehci_platform_data tegra_ehci2_pdata = {
 +      .phy_config = &tegra_ehci2_ulpi_phy_config,
 +      .operating_mode = TEGRA_USB_HOST,
 +      .power_down_on_bus_suspend = 1,
 +      .vbus_gpio = -1,
 +};
 +
 +struct tegra_ehci_platform_data tegra_ehci3_pdata = {
 +      .operating_mode = TEGRA_USB_HOST,
 +      .power_down_on_bus_suspend = 1,
 +      .vbus_gpio = -1,
 +};
 +
  struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {
        OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC1_BASE, "sdhci-tegra.0", NULL),
        OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC2_BASE, "sdhci-tegra.1", NULL),

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc arch/arm/mach-ux500/cpu-db8500.c
Simple merge

diff --cc arch/arm/plat-samsung/devs.c
index 8d26ce6,b151d49..03f654d
--- 1/arch/arm/plat-samsung/devs.c
--- 2/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@@ -47,20 -47,19 +47,20 @@@
  #include <plat/cpu.h>
  #include <plat/devs.h>
  #include <plat/adc.h>
- #include <plat/ata.h>
- #include <plat/ehci.h>
+ #include <linux/platform_data/ata-samsung_cf.h>
+ #include <linux/platform_data/usb-ehci-s5p.h>
  #include <plat/fb.h>
  #include <plat/fb-s3c2410.h>
- #include <plat/hwmon.h>
- #include <plat/iic.h>
 +#include <plat/hdmi.h>
+ #include <linux/platform_data/hwmon-s3c.h>
+ #include <linux/platform_data/i2c-s3c2410.h>
  #include <plat/keypad.h>
- #include <plat/mci.h>
- #include <plat/nand.h>
+ #include <linux/platform_data/mmc-s3cmci.h>
+ #include <linux/platform_data/mtd-nand-s3c2410.h>
  #include <plat/sdhci.h>
- #include <plat/ts.h>
- #include <plat/udc.h>
- #include <plat/usb-control.h>
+ #include <linux/platform_data/touchscreen-s3c2410.h>
+ #include <linux/platform_data/usb-s3c2410_udc.h>
+ #include <linux/platform_data/usb-ohci-s3c2410.h>
  #include <plat/usb-phy.h>
  #include <plat/regs-iic.h>
  #include <plat/regs-serial.h>

diff --cc drivers/dma/ep93xx_dma.c
Simple merge

diff --cc drivers/dma/imx-dma.c
Simple merge

diff --cc drivers/mmc/host/sdhci-esdhc-imx.c
Simple merge

diff --cc drivers/spi/spi-imx.c
Simple merge

diff --cc drivers/tty/serial/imx.c
Simple merge

diff --cc drivers/usb/gadget/pxa27x_udc.c
Simple merge

diff --cc drivers/usb/gadget/s3c2410_udc.c
Simple merge

diff --cc drivers/usb/host/ehci-mxc.c
Simple merge

diff --cc drivers/usb/host/ehci-s5p.c
Simple merge

diff --cc drivers/usb/host/ohci-pxa27x.c
index 77f4402,955c410..2bf1144
--- 1/drivers/usb/host/ohci-pxa27x.c
--- 2/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@@ -23,11 -23,9 +23,11 @@@
  #include <linux/signal.h>
  #include <linux/platform_device.h>
  #include <linux/clk.h>
 +#include <linux/of_platform.h>
 +#include <linux/of_gpio.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

diff --cc drivers/usb/musb/da8xx.c
index ce11d20,15a2627..8bc44b7
--- 1/drivers/usb/musb/da8xx.c
--- 2/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
@@@ -33,10 -33,9 +33,10 @@@
  #include <linux/io.h>
  #include <linux/platform_device.h>
  #include <linux/dma-mapping.h>
 +#include <linux/usb/nop-usb-xceiv.h>
  
  #include <mach/da8xx.h>
- #include <mach/usb.h>
+ #include <linux/platform_data/usb-davinci.h>
  
  #include "musb_core.h"
  

diff --cc drivers/usb/musb/ux500_dma.c
Simple merge

diff --cc drivers/video/vt8500lcdfb.c
Simple merge

diff --cc drivers/video/wm8505fb.c
index ec47424,ffeff48..77539c1
--- 1/drivers/video/wm8505fb.c
--- 2/drivers/video/wm8505fb.c
+++ b/drivers/video/wm8505fb.c
@@@ -28,11 -28,8 +28,11 @@@
  #include <linux/dma-mapping.h>
  #include <linux/platform_device.h>
  #include <linux/wait.h>
 +#include <linux/of.h>
 +#include <linux/of_fdt.h>
 +#include <linux/memblock.h>
  
- #include <mach/vt8500fb.h>
+ #include <linux/platform_data/video-vt8500lcdfb.h>
  
  #include "wm8505fb_regs.h"
  #include "wmt_ge_rops.h"