[PATCH 3/3] arm: omap: Move iommu/iovmm headers to platform_data
From: Ido Yariv <hidden>
Date: 2012-09-21 05:14:27
Also in:
linux-media, linux-omap
Subsystem:
arm port, iommu subsystem, media input infrastructure (v4l/dvb), omap2+ support, the rest · Maintainers:
Russell King, Joerg Roedel, Will Deacon, Mauro Carvalho Chehab, Aaro Koskinen, Andreas Kemnade, Kevin Hilman, Roger Quadros, Tony Lindgren, Linus Torvalds
Move iommu/iovmm headers from plat/ to platform_data/ as part of the single zImage work. Signed-off-by: Ido Yariv <redacted> --- arch/arm/mach-omap2/devices.c | 2 +- arch/arm/mach-omap2/iommu2.c | 2 +- arch/arm/mach-omap2/omap-iommu.c | 2 +- drivers/iommu/omap-iommu-debug.c | 4 ++-- drivers/iommu/omap-iommu.c | 2 +- drivers/iommu/omap-iovmm.c | 4 ++-- drivers/media/platform/omap3isp/isp.h | 5 +++-- drivers/media/platform/omap3isp/ispvideo.c | 6 ++++-- .../plat/iommu.h => include/linux/platform_data/iommu-omap.h | 0 .../plat/iovmm.h => include/linux/platform_data/iovmm-omap.h | 0 10 files changed, 15 insertions(+), 12 deletions(-) rename arch/arm/plat-omap/include/plat/iommu.h => include/linux/platform_data/iommu-omap.h (100%) rename arch/arm/plat-omap/include/plat/iovmm.h => include/linux/platform_data/iovmm-omap.h (100%)
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 1bb2e92..5bde5c2 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c@@ -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[] = { {
diff --git a/arch/arm/mach-omap2/iommu2.c b/arch/arm/mach-omap2/iommu2.c
index eefc379..cab7acc 100644
--- a/arch/arm/mach-omap2/iommu2.c
+++ b/arch/arm/mach-omap2/iommu2.c@@ -18,7 +18,7 @@ #include <linux/slab.h> #include <linux/stringify.h> -#include <plat/iommu.h> +#include <linux/platform_data/iommu-omap.h> /* * omap2 architecture specific register bit definitions
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index df298d4..a6a4ff8 100644
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c@@ -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"
diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c
index f55fc5d..e6ee7c2 100644
--- a/drivers/iommu/omap-iommu-debug.c
+++ b/drivers/iommu/omap-iommu-debug.c@@ -19,8 +19,8 @@ #include <linux/platform_device.h> #include <linux/debugfs.h> -#include <plat/iommu.h> -#include <plat/iovmm.h> +#include <linux/platform_data/iommu-omap.h> +#include <linux/platform_data/iovmm-omap.h> #include <plat/iopgtable.h>
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index d0b1234..298ca19 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c@@ -24,7 +24,7 @@ #include <asm/cacheflush.h> -#include <plat/iommu.h> +#include <linux/platform_data/iommu-omap.h> #include <plat/iopgtable.h>
diff --git a/drivers/iommu/omap-iovmm.c b/drivers/iommu/omap-iovmm.c
index 2e10c3e..ade7c6c 100644
--- a/drivers/iommu/omap-iovmm.c
+++ b/drivers/iommu/omap-iovmm.c@@ -21,8 +21,8 @@ #include <asm/cacheflush.h> #include <asm/mach/map.h> -#include <plat/iommu.h> -#include <plat/iovmm.h> +#include <linux/platform_data/iommu-omap.h> +#include <linux/platform_data/iovmm-omap.h> #include <plat/iopgtable.h>
diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h
index 8be7487..62c76f9 100644
--- a/drivers/media/platform/omap3isp/isp.h
+++ b/drivers/media/platform/omap3isp/isp.h@@ -34,8 +34,9 @@ #include <linux/platform_device.h> #include <linux/wait.h> #include <linux/iommu.h> -#include <plat/iommu.h> -#include <plat/iovmm.h> + +#include <linux/platform_data/iommu-omap.h> +#include <linux/platform_data/iovmm-omap.h> #include "ispstat.h" #include "ispccdc.h"
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index 3a5085e..1093f07 100644
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c@@ -34,8 +34,10 @@ #include <linux/vmalloc.h> #include <media/v4l2-dev.h> #include <media/v4l2-ioctl.h> -#include <plat/iommu.h> -#include <plat/iovmm.h> + +#include <linux/platform_data/iommu-omap.h> +#include <linux/platform_data/iovmm-omap.h> + #include <plat/omap-pm.h> #include "ispvideo.h"
diff --git a/arch/arm/plat-omap/include/plat/iommu.h b/include/linux/platform_data/iommu-omap.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/iommu.h
rename to include/linux/platform_data/iommu-omap.h
diff --git a/arch/arm/plat-omap/include/plat/iovmm.h b/include/linux/platform_data/iovmm-omap.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/iovmm.h
rename to include/linux/platform_data/iovmm-omap.h
--
1.7.11.4