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

Pull ARM SoC Header cleanups from Olof Johansson:
 "This is a collection of header file cleanups, mostly for OMAP and
  AT91, that keeps moving the platforms in the direction of
  multiplatform by removing the need for mach-dependent header files
  used in drivers and other places."

Fix up mostly trivial conflicts as per Olof.

* tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (106 commits)
  ARM: OMAP2+: Move iommu/iovmm headers to platform_data
  ARM: OMAP2+: Make some definitions local
  ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c
  ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h
  ARM: OMAP2+: Move iopgtable header to drivers/iommu/
  ARM: OMAP: Merge iommu2.h into iommu.h
  atmel: move ATMEL_MAX_UART to platform_data/atmel.h
  ARM: OMAP: Remove omap_init_consistent_dma_size()
  arm: at91: move at91rm9200 rtc header in drivers/rtc
  arm: at91: move reset controller header to arm/arm/mach-at91
  arm: at91: move pit define to the driver
  arm: at91: move at91_shdwc.h to arch/arm/mach-at91
  arm: at91: move board header to arch/arm/mach-at91
  arn: at91: move at91_tc.h to arch/arm/mach-at91
  arm: at91 move at91_aic.h to arch/arm/mach-at91
  arm: at91 move board.h to arch/arm/mach-at91
  arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
  arm: at91: drop machine defconfig
  ARM: OMAP: Remove NEED_MACH_GPIO_H
  ARM: OMAP: Remove unnecessary mach and plat includes
  ...

diff --cc arch/arm/Kconfig
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc arch/arm/mach-omap2/common.h
Simple merge

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

diff --cc arch/arm/mach-omap2/drm.c
index 49a7ffb,6282cc8..fce5aa3
--- 1/arch/arm/mach-omap2/drm.c
--- 2/arch/arm/mach-omap2/drm.c
+++ b/arch/arm/mach-omap2/drm.c
@@@ -23,11 -23,9 +23,11 @@@
  #include <linux/init.h>
  #include <linux/platform_device.h>
  #include <linux/dma-mapping.h>
 +#include <linux/platform_data/omap_drm.h>
  
- #include <plat/omap_device.h>
- #include <plat/omap_hwmod.h>
+ #include "omap_device.h"
+ #include "omap_hwmod.h"
 +#include <plat/cpu.h>
  
  #if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)
  

diff --cc arch/arm/mach-omap2/omap-mpuss-lowpower.c
Simple merge

diff --cc arch/arm/mach-omap2/omap4-common.c
index 6f94b4e,3cfcd41..eda316a
--- 1/arch/arm/mach-omap2/omap4-common.c
--- 2/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@@ -25,18 -24,15 +25,16 @@@
  #include <asm/hardware/cache-l2x0.h>
  #include <asm/mach/map.h>
  #include <asm/memblock.h>
 +#include <asm/smp_twd.h>
  
- #include <plat/sram.h>
- #include <plat/omap-secure.h>
- #include <plat/mmc.h>
- 
  #include "omap-wakeupgen.h"
- 
  #include "soc.h"
  #include "common.h"
+ #include "mmc.h"
  #include "hsmmc.h"
  #include "omap4-sar-layout.h"
+ #include "omap-secure.h"
+ #include "sram.h"
  
  #ifdef CONFIG_CACHE_L2X0
  static void __iomem *l2cache_base;

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

diff --cc arch/arm/mach-omap2/omap_hwmod.h
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 0b1249e,224bbaf..caf946d
--- 1/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@@ -21,18 -21,16 +21,17 @@@
  #include <linux/io.h>
  #include <linux/platform_data/gpio-omap.h>
  #include <linux/power/smartreflex.h>
 +#include <linux/platform_data/omap_ocp2scp.h>
+ #include <linux/i2c-omap.h>
+ 
+ #include <plat-omap/dma-omap.h>
  
- #include <plat/omap_hwmod.h>
- #include <plat/i2c.h>
- #include <plat/dma.h>
  #include <linux/platform_data/spi-omap2-mcspi.h>
  #include <linux/platform_data/asoc-ti-mcbsp.h>
- #include <plat/mmc.h>
+ #include <linux/platform_data/iommu-omap.h>
  #include <plat/dmtimer.h>
- #include <plat/common.h>
- #include <plat/iommu.h>
  
+ #include "omap_hwmod.h"
  #include "omap_hwmod_common_data.h"
  #include "cm1_44xx.h"
  #include "cm2_44xx.h"

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

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

diff --cc drivers/media/platform/omap3isp/ispccdc.c
Simple merge

diff --cc drivers/media/platform/omap3isp/ispstat.c
Simple merge

diff --cc drivers/media/platform/omap3isp/ispstat.h
Simple merge

diff --cc drivers/media/platform/omap3isp/ispvideo.c
Simple merge

diff --cc drivers/media/platform/soc_camera/omap1_camera.c
Simple merge

diff --cc drivers/mfd/omap-usb-host.c
Simple merge

diff --cc drivers/mfd/omap-usb-tll.c
Simple merge

diff --cc drivers/mmc/host/atmel-mci.c
Simple merge

diff --cc drivers/mmc/host/omap.c
Simple merge

diff --cc drivers/mmc/host/omap_hsmmc.c
index e1f3c11,9b24bd4..bc58078
--- 1/drivers/mmc/host/omap_hsmmc.c
--- 2/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@@ -37,11 -37,8 +37,9 @@@
  #include <linux/io.h>
  #include <linux/gpio.h>
  #include <linux/regulator/consumer.h>
 +#include <linux/pinctrl/consumer.h>
  #include <linux/pm_runtime.h>
- #include <mach/hardware.h>
- #include <plat/mmc.h>
- #include <plat/cpu.h>
+ #include <linux/platform_data/mmc-omap.h>
  
  /* OMAP HSMMC Host Controller Registers */
  #define OMAP_HSMMC_SYSSTATUS  0x0014

diff --cc drivers/tty/serial/atmel_serial.c
index 1a8a271,5660ec2..922e85a
--- 1/drivers/tty/serial/atmel_serial.c
--- 2/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@@ -39,13 -39,13 +39,12 @@@
  #include <linux/atmel_pdc.h>
  #include <linux/atmel_serial.h>
  #include <linux/uaccess.h>
 +#include <linux/pinctrl/consumer.h>
+ #include <linux/platform_data/atmel.h>
  
  #include <asm/io.h>
  #include <asm/ioctls.h>
  
- #include <mach/board.h>
 -#include <asm/mach/serial_at91.h>
--
  #ifdef CONFIG_ARM
  #include <mach/cpu.h>
  #include <asm/gpio.h>

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

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

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

diff --cc drivers/usb/host/ohci-at91.c
Simple merge

diff --cc drivers/usb/host/ohci-omap.c
Simple merge

diff --cc drivers/usb/host/ohci-omap3.c
Simple merge

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

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

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

diff --cc drivers/video/omap2/dss/dss.c
Simple merge

diff --cc drivers/video/omap2/dss/hdmi.c
Simple merge

diff --cc drivers/video/omap2/omapfb/omapfb-ioctl.c
Simple merge

diff --cc include/linux/platform_data/mmc-omap.h
index 346af5b,2bf6ea8..2bf1b30
--- 1/arch/arm/plat-omap/include/plat/mmc.h
--- 2/include/linux/platform_data/mmc-omap.h
+++ b/include/linux/platform_data/mmc-omap.h
@@@ -126,7 -107,9 +107,10 @@@ struct omap_mmc_platform_data 
                /* we can put the features above into this variable */
  #define HSMMC_HAS_PBIAS               (1 << 0)
  #define HSMMC_HAS_UPDATED_RESET       (1 << 1)
 -#define MMC_OMAP7XX           (1 << 2)
 -#define MMC_OMAP15XX          (1 << 3)
 -#define MMC_OMAP16XX          (1 << 4)
 +#define HSMMC_HAS_HSPE_SUPPORT        (1 << 2)
++#define MMC_OMAP7XX           (1 << 3)
++#define MMC_OMAP15XX          (1 << 4)
++#define MMC_OMAP16XX          (1 << 5)
                unsigned features;
  
                int switch_pin;                 /* gpio (card detect) */