Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 794b175f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.8/cleanup-headers-iommu-signed' of... 

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

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: default avatarOlof Johansson <olof@lixom.net>
parents 4fabb633 2ab7c848

arch/arm/mach-omap2/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -202,8 +202,6 @@ obj-$(CONFIG_HW_PERF_EVENTS) += pmu.o 
obj-$(CONFIG_OMAP_MBOX_FWK)		+= mailbox_mach.o

mailbox_mach-objs			:= mailbox.o



obj-$(CONFIG_OMAP_IOMMU)		+= iommu2.o



iommu-$(CONFIG_OMAP_IOMMU)		:= omap-iommu.o

obj-y					+= $(iommu-m) $(iommu-y)

arch/arm/mach-omap2/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static struct platform_device omap2cam_device = { 


#if defined(CONFIG_IOMMU_API)



#include <plat/iommu.h>

#include <linux/platform_data/iommu-omap.h>



static struct resource omap3isp_resources[] = {

	{

arch/arm/mach-omap2/omap-iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>



#include <plat/iommu.h>

#include <linux/platform_data/iommu-omap.h>



#include "soc.h"

#include "common.h"

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
#include "l4_3xxx.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"

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 
#include <linux/platform_data/omap_ocp2scp.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/dmtimer.h>

#include <plat/iommu.h>



#include "omap_hwmod.h"

#include "omap_hwmod_common_data.h"