Merge tag 'omap-for-v3.8/cleanup-headers-iommu-signed' of git://git.kernel.org/pub...

From Tony Lindgren:

Move most of remaining omap iommu code to drivers/iommu.
This is needed for the multiplatform kernels as the plat
and mach headers cannot be included.

These changes were agreed to be merged via the arm-soc
tree by Joerg and Ohad as these will cause some merge
conflicts with the other related clean-up branches.

So omap-for-v3.8/cleanup-headers-iommu should be added
as one of the depends branches for arm-soc.

* tag 'omap-for-v3.8/cleanup-headers-iommu-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  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

Conflicts due to surrounding changes fixed up in:
	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
	drivers/media/platform/omap3isp/ispvideo.c

Signed-off-by: Olof Johansson <[email protected]>

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

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

diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index addc1c24ca2efd303e04abead6a4f3f7e7ee9395,621bc713723310fe720e67644088b5d5c4eadc72..7f73f2132acce82eb103203814af4378f90f231b
--- 1/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@@ -19,13 -17,17 +19,13 @@@
  #include <linux/power/smartreflex.h>
  #include <linux/platform_data/gpio-omap.h>
  
 -#include <plat/omap_hwmod.h>
 -#include <plat/dma.h>
 -#include <plat/serial.h>
 +#include <plat-omap/dma-omap.h>
  #include "l3_3xxx.h"
  #include "l4_3xxx.h"
 -#include <plat/i2c.h>
 -#include <plat/mmc.h>
  #include <linux/platform_data/asoc-ti-mcbsp.h>
  #include <linux/platform_data/spi-omap2-mcspi.h>
+ #include <linux/platform_data/iommu-omap.h>
  #include <plat/dmtimer.h>
- #include <plat/iommu.h>
  
  #include "am35xx.h"
  

diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index f5b55a78a5f0fa0842976b8ca26d625210f39e37,5850b3e81512f2c0df51588e36b37ef30c288da0..26f8e9f18190ad991e72702abd0f16922c5934f5
--- 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,17 -21,17 +21,17 @@@
  #include <linux/io.h>
  #include <linux/platform_data/gpio-omap.h>
  #include <linux/power/smartreflex.h>
 +#include <linux/i2c-omap.h>
  
 -#include <plat/omap_hwmod.h>
 -#include <plat/i2c.h>
 -#include <plat/dma.h>
 +#include <plat-omap/dma-omap.h>
 +
 +#include <linux/platform_data/omap_ocp2scp.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/iommu.h>
 -#include <plat/common.h>
  
 +#include "omap_hwmod.h"
  #include "omap_hwmod_common_data.h"
  #include "cm1_44xx.h"
  #include "cm2_44xx.h"

diff --cc drivers/media/platform/omap3isp/ispvideo.c
index 5bd40e6870cc36176ea787208f6a707403d86793,21f7313e6999372fe130c7d3e4d24ed3259dde33..c4be4fa8a7d7d0a4211e00b8e108fe101b2bc178
--- 1/drivers/media/platform/omap3isp/ispvideo.c
--- 2/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@@ -34,8 -35,7 +35,9 @@@
  #include <linux/vmalloc.h>
  #include <media/v4l2-dev.h>
  #include <media/v4l2-ioctl.h>
 +#include <plat/iommu.h>
 +#include <plat/iovmm.h>
+ #include <plat/omap-pm.h>
  
  #include "ispvideo.h"
  #include "isp.h"