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: Mauro Carvalho Chehab <mchehab@redhat.com> Acked-by: Ohad Ben-Cohen <ohad@wizery.com> Acked-by: Joerg Roedel <joro@8bytes.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
7bd9e25fa4
commit
2ab7c84815
|
@ -126,7 +126,7 @@ static struct platform_device omap2cam_device = {
|
||||||
|
|
||||||
#if defined(CONFIG_IOMMU_API)
|
#if defined(CONFIG_IOMMU_API)
|
||||||
|
|
||||||
#include <plat/iommu.h>
|
#include <linux/platform_data/iommu-omap.h>
|
||||||
|
|
||||||
static struct resource omap3isp_resources[] = {
|
static struct resource omap3isp_resources[] = {
|
||||||
{
|
{
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
|
|
||||||
#include <plat/iommu.h>
|
#include <linux/platform_data/iommu-omap.h>
|
||||||
|
|
||||||
#include "soc.h"
|
#include "soc.h"
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
|
@ -26,8 +26,8 @@
|
||||||
#include <plat/mmc.h>
|
#include <plat/mmc.h>
|
||||||
#include <linux/platform_data/asoc-ti-mcbsp.h>
|
#include <linux/platform_data/asoc-ti-mcbsp.h>
|
||||||
#include <linux/platform_data/spi-omap2-mcspi.h>
|
#include <linux/platform_data/spi-omap2-mcspi.h>
|
||||||
|
#include <linux/platform_data/iommu-omap.h>
|
||||||
#include <plat/dmtimer.h>
|
#include <plat/dmtimer.h>
|
||||||
#include <plat/iommu.h>
|
|
||||||
|
|
||||||
#include "am35xx.h"
|
#include "am35xx.h"
|
||||||
|
|
||||||
|
|
|
@ -27,10 +27,10 @@
|
||||||
#include <plat/dma.h>
|
#include <plat/dma.h>
|
||||||
#include <linux/platform_data/spi-omap2-mcspi.h>
|
#include <linux/platform_data/spi-omap2-mcspi.h>
|
||||||
#include <linux/platform_data/asoc-ti-mcbsp.h>
|
#include <linux/platform_data/asoc-ti-mcbsp.h>
|
||||||
|
#include <linux/platform_data/iommu-omap.h>
|
||||||
#include <plat/mmc.h>
|
#include <plat/mmc.h>
|
||||||
#include <plat/dmtimer.h>
|
#include <plat/dmtimer.h>
|
||||||
#include <plat/common.h>
|
#include <plat/common.h>
|
||||||
#include <plat/iommu.h>
|
|
||||||
|
|
||||||
#include "omap_hwmod_common_data.h"
|
#include "omap_hwmod_common_data.h"
|
||||||
#include "cm1_44xx.h"
|
#include "cm1_44xx.h"
|
||||||
|
|
|
@ -19,8 +19,7 @@
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/debugfs.h>
|
#include <linux/debugfs.h>
|
||||||
#include <linux/omap-iommu.h>
|
#include <linux/omap-iommu.h>
|
||||||
|
#include <linux/platform_data/iommu-omap.h>
|
||||||
#include <plat/iommu.h>
|
|
||||||
|
|
||||||
#include "omap-iopgtable.h"
|
#include "omap-iopgtable.h"
|
||||||
#include "omap-iommu.h"
|
#include "omap-iommu.h"
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
|
|
||||||
#include <asm/cacheflush.h>
|
#include <asm/cacheflush.h>
|
||||||
|
|
||||||
#include <plat/iommu.h>
|
#include <linux/platform_data/iommu-omap.h>
|
||||||
|
|
||||||
#include "omap-iopgtable.h"
|
#include "omap-iopgtable.h"
|
||||||
#include "omap-iommu.h"
|
#include "omap-iommu.h"
|
||||||
|
|
|
@ -19,8 +19,8 @@
|
||||||
#include <linux/omap-iommu.h>
|
#include <linux/omap-iommu.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/stringify.h>
|
#include <linux/stringify.h>
|
||||||
|
#include <linux/platform_data/iommu-omap.h>
|
||||||
|
|
||||||
#include <plat/iommu.h>
|
|
||||||
#include "omap-iommu.h"
|
#include "omap-iommu.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -18,12 +18,11 @@
|
||||||
#include <linux/scatterlist.h>
|
#include <linux/scatterlist.h>
|
||||||
#include <linux/iommu.h>
|
#include <linux/iommu.h>
|
||||||
#include <linux/omap-iommu.h>
|
#include <linux/omap-iommu.h>
|
||||||
|
#include <linux/platform_data/iommu-omap.h>
|
||||||
|
|
||||||
#include <asm/cacheflush.h>
|
#include <asm/cacheflush.h>
|
||||||
#include <asm/mach/map.h>
|
#include <asm/mach/map.h>
|
||||||
|
|
||||||
#include <plat/iommu.h>
|
|
||||||
|
|
||||||
#include "omap-iopgtable.h"
|
#include "omap-iopgtable.h"
|
||||||
#include "omap-iommu.h"
|
#include "omap-iommu.h"
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
#include <linux/vmalloc.h>
|
#include <linux/vmalloc.h>
|
||||||
#include <media/v4l2-dev.h>
|
#include <media/v4l2-dev.h>
|
||||||
#include <media/v4l2-ioctl.h>
|
#include <media/v4l2-ioctl.h>
|
||||||
#include <plat/iommu.h>
|
|
||||||
#include <plat/omap-pm.h>
|
#include <plat/omap-pm.h>
|
||||||
|
|
||||||
#include "ispvideo.h"
|
#include "ispvideo.h"
|
||||||
|
|
Loading…
Reference in a new issue