Merge branch 'multiplatform/platform-data' into next/multiplatform

* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>

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

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

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

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

diff --cc arch/arm/mach-exynos/mach-origen.c
index abd0e60,4a531dc..fc23f74
--- 1/arch/arm/mach-exynos/mach-origen.c
--- 2/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@@ -42,9 -42,8 +42,9 @@@
  #include <plat/backlight.h>
  #include <plat/fb.h>
  #include <plat/mfc.h>
 +#include <plat/hdmi.h>
  
- #include <mach/ohci.h>
+ #include <linux/platform_data/usb-exynos.h>
  #include <mach/map.h>
  
  #include <drm/exynos_drm.h>

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

diff --cc arch/arm/mach-exynos/mach-smdkv310.c
index 69b858c,fa2ada6..6e52cbd
--- 1/arch/arm/mach-exynos/mach-smdkv310.c
--- 2/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@@ -38,12 -38,11 +38,12 @@@
  #include <plat/gpio-cfg.h>
  #include <plat/backlight.h>
  #include <plat/mfc.h>
- #include <plat/ehci.h>
+ #include <linux/platform_data/usb-ehci-s5p.h>
  #include <plat/clock.h>
 +#include <plat/hdmi.h>
  
  #include <mach/map.h>
- #include <mach/ohci.h>
+ #include <linux/platform_data/usb-exynos.h>
  
  #include <drm/exynos_drm.h>
  #include "common.h"

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

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

diff --cc arch/arm/mach-kirkwood/db88f6281-bp-setup.c
Simple merge

diff --cc arch/arm/mach-mmp/sram.c
Simple merge

diff --cc arch/arm/mach-msm/board-qsd8x50.c
index b16b71a,b21bb4c..a344a37
--- 1/arch/arm/mach-msm/board-qsd8x50.c
--- 2/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@@ -32,10 -32,11 +32,10 @@@
  #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"
 -
 -extern struct sys_timer msm_timer;
 +#include "common.h"
  
  static const resource_size_t qsd8x50_surf_smc91x_base __initdata = 0x70000300;
  static const unsigned        qsd8x50_surf_smc91x_gpio __initdata = 156;

diff --cc arch/arm/mach-msm/include/mach/board.h
Simple merge

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

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

diff --cc arch/arm/mach-pxa/devices.c
index adf32e6,e66bd1b..ddaa04d
--- 1/arch/arm/mach-pxa/devices.c
--- 2/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@@ -6,18 -6,19 +6,18 @@@
  #include <linux/spi/pxa2xx_spi.h>
  #include <linux/i2c/pxa-i2c.h>
  
 -#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"

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

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

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

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

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

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

diff --cc arch/arm/mach-tegra/board-paz00.c
index 5930551,112bf68..740e16f
--- 1/arch/arm/mach-tegra/board-paz00.c
--- 2/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@@ -17,10 -17,72 +17,10 @@@
   *
   */
  
 -#include <linux/kernel.h>
 -#include <linux/init.h>
  #include <linux/platform_device.h>
 -#include <linux/serial_8250.h>
 -#include <linux/of_serial.h>
 -#include <linux/clk.h>
 -#include <linux/dma-mapping.h>
 -#include <linux/gpio_keys.h>
 -#include <linux/pda_power.h>
 -#include <linux/io.h>
 -#include <linux/input.h>
 -#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>
 -#include <asm/mach/arch.h>
 -#include <asm/mach/time.h>
 -#include <asm/setup.h>
 -
 -#include <mach/iomap.h>
 -#include <mach/irqs.h>
--
+ #include "board.h"
  #include "board-paz00.h"
 -#include "clock.h"
 -#include "devices.h"
 -#include "gpio-names.h"
 -
 -static struct plat_serial8250_port debug_uart_platform_data[] = {
 -      {
 -              /* serial port on JP1 */
 -              .membase        = IO_ADDRESS(TEGRA_UARTA_BASE),
 -              .mapbase        = TEGRA_UARTA_BASE,
 -              .irq            = INT_UARTA,
 -              .flags          = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
 -              .type           = PORT_TEGRA,
 -              .handle_break   = tegra_serial_handle_break,
 -              .iotype         = UPIO_MEM,
 -              .regshift       = 2,
 -              .uartclk        = 216000000,
 -      }, {
 -              /* serial port on mini-pcie */
 -              .membase        = IO_ADDRESS(TEGRA_UARTC_BASE),
 -              .mapbase        = TEGRA_UARTC_BASE,
 -              .irq            = INT_UARTC,
 -              .flags          = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
 -              .type           = PORT_TEGRA,
 -              .handle_break   = tegra_serial_handle_break,
 -              .iotype         = UPIO_MEM,
 -              .regshift       = 2,
 -              .uartclk        = 216000000,
 -      }, {
 -              .flags          = 0
 -      }
 -};
 -
 -static struct platform_device debug_uart = {
 -      .name = "serial8250",
 -      .id = PLAT8250_DEV_PLATFORM,
 -      .dev = {
 -              .platform_data = debug_uart_platform_data,
 -      },
 -};
  
  static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {
        .name           = "wifi_rfkill",

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-orion/common.c
Simple merge

diff --cc arch/arm/plat-samsung/devs.c
Simple merge

diff --cc drivers/mtd/nand/pxa3xx_nand.c
index d944d6e,c53502f..c452271
--- 1/drivers/mtd/nand/pxa3xx_nand.c
--- 2/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@@ -22,11 -22,9 +22,11 @@@
  #include <linux/io.h>
  #include <linux/irq.h>
  #include <linux/slab.h>
 +#include <linux/of.h>
 +#include <linux/of_device.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)

diff --cc drivers/net/irda/pxaficp_ir.c
index cb0a5d3,aa4b947..002a442
--- 1/drivers/net/irda/pxaficp_ir.c
--- 2/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@@ -28,9 -28,9 +28,9 @@@
  #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>
 +#include <mach/regs-uart.h>
  
  #define FICP          __REG(0x40800000)  /* Start of FICP area */
  #define ICCR0         __REG(0x40800000)  /* ICP Control Register 0 */

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

diff --cc include/linux/platform_data/camera-mx2.h
Simple merge