From: Olof Johansson <olof@lixom.net>
Date: Sat, 1 Dec 2012 05:40:59 +0000 (-0800)
Subject: Merge tag 'omap-for-v3.8/cleanup-headers-iommu-signed' of git://git.kernel.org/pub... 
X-Git-Tag: firefly_0821_release~3680^2~1486^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=8556650dd3370a927217f16444aac5cc0c71e61b;p=firefly-linux-kernel-4.4.55.git

Merge tag 'omap-for-v3.8/cleanup-headers-iommu-signed' of git://git./linux/kernel/git/tmlind/linux-omap into next/headers

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 in:
	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
	drivers/media/platform/omap3isp/ispvideo.c

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

8556650dd3370a927217f16444aac5cc0c71e61b
diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index abe66ced903f,621bc7137233..1150f823f24e
--- a/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 7a6132848f5d,5850b3e81512..224bbaf73f32
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@@ -21,16 -21,17 +21,16 @@@
  #include <linux/io.h>
  #include <linux/platform_data/gpio-omap.h>
  #include <linux/power/smartreflex.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 <linux/platform_data/iommu-omap.h>
 -#include <plat/mmc.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 5bd40e6870cc,21f7313e6999..c4be4fa8a7d7
--- a/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"