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

Commit 2ab7c848 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Move iommu/iovmm headers to platform_data 



Move iommu/iovmm headers from plat/ to platform_data/ as part of the
single zImage work.

Partially based on an earlier version by Ido Yariv <ido@wizery.com>.

Cc: Ido Yariv <ido@wizery.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Omar Ramirez Luna <omar.luna@linaro.org>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
Acked-by: default avatarJoerg Roedel <joro@8bytes.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 7bd9e25f

arch/arm/mach-omap2/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,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
@@ -26,8 +26,8 @@ 
#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"

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ 
#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/common.h>

#include <plat/iommu.h>



#include "omap_hwmod_common_data.h"

#include "cm1_44xx.h"

drivers/iommu/omap-iommu-debug.c

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
#include <linux/platform_device.h>

#include <linux/debugfs.h>

#include <linux/omap-iommu.h>



#include <plat/iommu.h>

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



#include "omap-iopgtable.h"

#include "omap-iommu.h"