diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-02 12:24:03 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-20 10:04:29 -0800 |
| commit | c8d35c84f5494d8d294205b598f927a11fd41f34 (patch) | |
| tree | 2a28d6147cc9a0790419d4a2b5ae8ff75919f4f6 /drivers/media/platform | |
| parent | 2f7702af64d6ae7ae8b7f6d5dca1bf8bdaf0ac1f (diff) | |
ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h
Looks like the iommu framework does not have generic functions
exported for all the needs yet. The hardware specific functions
are defined in files like intel-iommu.h and amd-iommu.h. Follow
the same standard for omap-iommu.h.
This is needed because we are removing plat and mach includes
for ARM common zImage support. Further work should continue
in the iommu framework context as only pure platform data will
be communicated from arch/arm/*omap*/* code to the iommu
framework.
Cc: Ido Yariv <ido@wizery.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Omar Ramirez Luna <omar.luna@linaro.org>
Cc: linux-media@vger.kernel.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>
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/omap3isp/isp.c | 1 | ||||
| -rw-r--r-- | drivers/media/platform/omap3isp/isp.h | 4 | ||||
| -rw-r--r-- | drivers/media/platform/omap3isp/ispccdc.c | 1 | ||||
| -rw-r--r-- | drivers/media/platform/omap3isp/ispstat.c | 1 | ||||
| -rw-r--r-- | drivers/media/platform/omap3isp/ispvideo.c | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index 99640d8c1db..7f182f0ff3d 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -61,6 +61,7 @@ #include <linux/i2c.h> #include <linux/interrupt.h> #include <linux/module.h> +#include <linux/omap-iommu.h> #include <linux/platform_device.h> #include <linux/regulator/consumer.h> #include <linux/slab.h> diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h index 8be7487c326..8d6866942b8 100644 --- a/drivers/media/platform/omap3isp/isp.h +++ b/drivers/media/platform/omap3isp/isp.h @@ -31,11 +31,9 @@ #include <media/v4l2-device.h> #include <linux/device.h> #include <linux/io.h> +#include <linux/iommu.h> #include <linux/platform_device.h> #include <linux/wait.h> -#include <linux/iommu.h> -#include <plat/iommu.h> -#include <plat/iovmm.h> #include "ispstat.h" #include "ispccdc.h" diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c index 60181ab9606..6ae1ffb277e 100644 --- a/drivers/media/platform/omap3isp/ispccdc.c +++ b/drivers/media/platform/omap3isp/ispccdc.c @@ -30,6 +30,7 @@ #include <linux/device.h> #include <linux/dma-mapping.h> #include <linux/mm.h> +#include <linux/omap-iommu.h> #include <linux/sched.h> #include <linux/slab.h> #include <media/v4l2-event.h> diff --git a/drivers/media/platform/omap3isp/ispstat.c b/drivers/media/platform/omap3isp/ispstat.c index d7ac76b5c2a..35c38237449 100644 --- a/drivers/media/platform/omap3isp/ispstat.c +++ b/drivers/media/platform/omap3isp/ispstat.c @@ -26,6 +26,7 @@ */ #include <linux/dma-mapping.h> +#include <linux/omap-iommu.h> #include <linux/slab.h> #include <linux/uaccess.h> diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c index a0b737fecf1..a4b829027d7 100644 --- a/drivers/media/platform/omap3isp/ispvideo.c +++ b/drivers/media/platform/omap3isp/ispvideo.c @@ -27,6 +27,7 @@ #include <linux/clk.h> #include <linux/mm.h> #include <linux/module.h> +#include <linux/omap-iommu.h> #include <linux/pagemap.h> #include <linux/scatterlist.h> #include <linux/sched.h> @@ -35,7 +36,6 @@ #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" |