diff options
author | Tony Lindgren <tony@atomide.com> | 2012-11-02 15:24:03 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-11-20 13:04:29 -0500 |
commit | c8d35c84f5494d8d294205b598f927a11fd41f34 (patch) | |
tree | 2a28d6147cc9a0790419d4a2b5ae8ff75919f4f6 /drivers/media | |
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')
-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 99640d8c1db0..7f182f0ff3da 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c | |||
@@ -61,6 +61,7 @@ | |||
61 | #include <linux/i2c.h> | 61 | #include <linux/i2c.h> |
62 | #include <linux/interrupt.h> | 62 | #include <linux/interrupt.h> |
63 | #include <linux/module.h> | 63 | #include <linux/module.h> |
64 | #include <linux/omap-iommu.h> | ||
64 | #include <linux/platform_device.h> | 65 | #include <linux/platform_device.h> |
65 | #include <linux/regulator/consumer.h> | 66 | #include <linux/regulator/consumer.h> |
66 | #include <linux/slab.h> | 67 | #include <linux/slab.h> |
diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h index 8be7487c326f..8d6866942b85 100644 --- a/drivers/media/platform/omap3isp/isp.h +++ b/drivers/media/platform/omap3isp/isp.h | |||
@@ -31,11 +31,9 @@ | |||
31 | #include <media/v4l2-device.h> | 31 | #include <media/v4l2-device.h> |
32 | #include <linux/device.h> | 32 | #include <linux/device.h> |
33 | #include <linux/io.h> | 33 | #include <linux/io.h> |
34 | #include <linux/iommu.h> | ||
34 | #include <linux/platform_device.h> | 35 | #include <linux/platform_device.h> |
35 | #include <linux/wait.h> | 36 | #include <linux/wait.h> |
36 | #include <linux/iommu.h> | ||
37 | #include <plat/iommu.h> | ||
38 | #include <plat/iovmm.h> | ||
39 | 37 | ||
40 | #include "ispstat.h" | 38 | #include "ispstat.h" |
41 | #include "ispccdc.h" | 39 | #include "ispccdc.h" |
diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c index 60181ab96063..6ae1ffb277e7 100644 --- a/drivers/media/platform/omap3isp/ispccdc.c +++ b/drivers/media/platform/omap3isp/ispccdc.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/device.h> | 30 | #include <linux/device.h> |
31 | #include <linux/dma-mapping.h> | 31 | #include <linux/dma-mapping.h> |
32 | #include <linux/mm.h> | 32 | #include <linux/mm.h> |
33 | #include <linux/omap-iommu.h> | ||
33 | #include <linux/sched.h> | 34 | #include <linux/sched.h> |
34 | #include <linux/slab.h> | 35 | #include <linux/slab.h> |
35 | #include <media/v4l2-event.h> | 36 | #include <media/v4l2-event.h> |
diff --git a/drivers/media/platform/omap3isp/ispstat.c b/drivers/media/platform/omap3isp/ispstat.c index d7ac76b5c2ae..35c38237449d 100644 --- a/drivers/media/platform/omap3isp/ispstat.c +++ b/drivers/media/platform/omap3isp/ispstat.c | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <linux/dma-mapping.h> | 28 | #include <linux/dma-mapping.h> |
29 | #include <linux/omap-iommu.h> | ||
29 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
30 | #include <linux/uaccess.h> | 31 | #include <linux/uaccess.h> |
31 | 32 | ||
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c index a0b737fecf13..a4b829027d71 100644 --- a/drivers/media/platform/omap3isp/ispvideo.c +++ b/drivers/media/platform/omap3isp/ispvideo.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/clk.h> | 27 | #include <linux/clk.h> |
28 | #include <linux/mm.h> | 28 | #include <linux/mm.h> |
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | #include <linux/omap-iommu.h> | ||
30 | #include <linux/pagemap.h> | 31 | #include <linux/pagemap.h> |
31 | #include <linux/scatterlist.h> | 32 | #include <linux/scatterlist.h> |
32 | #include <linux/sched.h> | 33 | #include <linux/sched.h> |
@@ -35,7 +36,6 @@ | |||
35 | #include <media/v4l2-dev.h> | 36 | #include <media/v4l2-dev.h> |
36 | #include <media/v4l2-ioctl.h> | 37 | #include <media/v4l2-ioctl.h> |
37 | #include <plat/iommu.h> | 38 | #include <plat/iommu.h> |
38 | #include <plat/iovmm.h> | ||
39 | #include <plat/omap-pm.h> | 39 | #include <plat/omap-pm.h> |
40 | 40 | ||
41 | #include "ispvideo.h" | 41 | #include "ispvideo.h" |