5 files changed, 23 insertions, 44 deletions

diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c
index b818cacf420..d4c48ef227f 100644
--- a/drivers/media/video/omap3isp/isp.c
+++ b/drivers/media/video/omap3isp/isp.c
@@ -80,13 +80,6 @@
 #include "isph3a.h"
 #include "isphist.h"
 
-/*
- * this is provided as an interim solution until omap3isp doesn't need
- * any omap-specific iommu API
- */
-#define to_iommu(dev)                                                   \
-        (struct omap_iommu *)platform_get_drvdata(to_platform_device(dev))
-
 static unsigned int autoidle;
 module_param(autoidle, int, 0444);
 MODULE_PARM_DESC(autoidle, "Enable OMAP3ISP AUTOIDLE support");
@@ -1114,8 +1107,7 @@ isp_restore_context(struct isp_device *isp, struct isp_reg *reg_list)
 static void isp_save_ctx(struct isp_device *isp)
 {
         isp_save_context(isp, isp_reg_list);
-        if (isp->iommu)
-                omap_iommu_save_ctx(isp->iommu);
+        omap_iommu_save_ctx(isp->dev);
 }
 
 /*
@@ -1128,8 +1120,7 @@ static void isp_save_ctx(struct isp_device *isp)
 static void isp_restore_ctx(struct isp_device *isp)
 {
         isp_restore_context(isp, isp_reg_list);
-        if (isp->iommu)
-                omap_iommu_restore_ctx(isp->iommu);
+        omap_iommu_restore_ctx(isp->dev);
         omap3isp_ccdc_restore_context(isp);
         omap3isp_preview_restore_context(isp);
 }
@@ -1983,7 +1974,7 @@ static int isp_remove(struct platform_device *pdev)
         isp_cleanup_modules(isp);
 
         omap3isp_get(isp);
-        iommu_detach_device(isp->domain, isp->iommu_dev);
+        iommu_detach_device(isp->domain, &pdev->dev);
         iommu_domain_free(isp->domain);
         omap3isp_put(isp);
 
@@ -2131,17 +2122,6 @@ static int isp_probe(struct platform_device *pdev)
                 }
         }
 
-        /* IOMMU */
-        isp->iommu_dev = omap_find_iommu_device("isp");
-        if (!isp->iommu_dev) {
-                dev_err(isp->dev, "omap_find_iommu_device failed\n");
-                ret = -ENODEV;
-                goto error_isp;
-        }
-
-        /* to be removed once iommu migration is complete */
-        isp->iommu = to_iommu(isp->iommu_dev);
-
         isp->domain = iommu_domain_alloc(pdev->dev.bus);
         if (!isp->domain) {
                 dev_err(isp->dev, "can't alloc iommu domain\n");
@@ -2149,7 +2129,7 @@ static int isp_probe(struct platform_device *pdev)
                 goto error_isp;
         }
 
-        ret = iommu_attach_device(isp->domain, isp->iommu_dev);
+        ret = iommu_attach_device(isp->domain, &pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "can't attach iommu device: %d\n", ret);
                 goto free_domain;
@@ -2188,7 +2168,7 @@ error_modules:
 error_irq:
         free_irq(isp->irq_num, isp);
 detach_dev:
-        iommu_detach_device(isp->domain, isp->iommu_dev);
+        iommu_detach_device(isp->domain, &pdev->dev);
 free_domain:
         iommu_domain_free(isp->domain);
 error_isp:
diff --git a/drivers/media/video/omap3isp/isp.h b/drivers/media/video/omap3isp/isp.h
index 705946ef4d6..d96603eb0d1 100644
--- a/drivers/media/video/omap3isp/isp.h
+++ b/drivers/media/video/omap3isp/isp.h
@@ -212,9 +212,7 @@ struct isp_device {
         unsigned int sbl_resources;
         unsigned int subclk_resources;
 
-        struct omap_iommu *iommu;
         struct iommu_domain *domain;
-        struct device *iommu_dev;
 
         struct isp_platform_callback platform_cb;
 };
diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c
index b0b0fa5a357..d341ba12593 100644
--- a/drivers/media/video/omap3isp/ispccdc.c
+++ b/drivers/media/video/omap3isp/ispccdc.c
@@ -366,7 +366,7 @@ static void ccdc_lsc_free_request(struct isp_ccdc_device *ccdc,
                 dma_unmap_sg(isp->dev, req->iovm->sgt->sgl,
                              req->iovm->sgt->nents, DMA_TO_DEVICE);
         if (req->table)
-                omap_iommu_vfree(isp->domain, isp->iommu, req->table);
+                omap_iommu_vfree(isp->domain, isp->dev, req->table);
         kfree(req);
 }
 
@@ -438,7 +438,7 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc,
 
                 req->enable = 1;
 
-                req->table = omap_iommu_vmalloc(isp->domain, isp->iommu, 0,
+                req->table = omap_iommu_vmalloc(isp->domain, isp->dev, 0,
                                         req->config.size, IOMMU_FLAG);
                 if (IS_ERR_VALUE(req->table)) {
                         req->table = 0;
@@ -446,7 +446,7 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc,
                         goto done;
                 }
 
-                req->iovm = omap_find_iovm_area(isp->iommu, req->table);
+                req->iovm = omap_find_iovm_area(isp->dev, req->table);
                 if (req->iovm == NULL) {
                         ret = -ENOMEM;
                         goto done;
@@ -462,7 +462,7 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc,
                 dma_sync_sg_for_cpu(isp->dev, req->iovm->sgt->sgl,
                                     req->iovm->sgt->nents, DMA_TO_DEVICE);
 
-                table = omap_da_to_va(isp->iommu, req->table);
+                table = omap_da_to_va(isp->dev, req->table);
                 if (copy_from_user(table, config->lsc, req->config.size)) {
                         ret = -EFAULT;
                         goto done;
@@ -734,15 +734,15 @@ static int ccdc_config(struct isp_ccdc_device *ccdc,
                          * already done by omap_iommu_vmalloc().
                          */
                         size = ccdc->fpc.fpnum * 4;
-                        table_new = omap_iommu_vmalloc(isp->domain, isp->iommu,
+                        table_new = omap_iommu_vmalloc(isp->domain, isp->dev,
                                                         0, size, IOMMU_FLAG);
                         if (IS_ERR_VALUE(table_new))
                                 return -ENOMEM;
 
-                        if (copy_from_user(omap_da_to_va(isp->iommu, table_new),
+                        if (copy_from_user(omap_da_to_va(isp->dev, table_new),
                                            (__force void __user *)
                                            ccdc->fpc.fpcaddr, size)) {
-                                omap_iommu_vfree(isp->domain, isp->iommu,
+                                omap_iommu_vfree(isp->domain, isp->dev,
                                                                 table_new);
                                 return -EFAULT;
                         }
@@ -753,7 +753,7 @@ static int ccdc_config(struct isp_ccdc_device *ccdc,
 
                 ccdc_configure_fpc(ccdc);
                 if (table_old != 0)
-                        omap_iommu_vfree(isp->domain, isp->iommu, table_old);
+                        omap_iommu_vfree(isp->domain, isp->dev, table_old);
         }
 
         return ccdc_lsc_config(ccdc, ccdc_struct);
@@ -1408,7 +1408,7 @@ static void ccdc_hs_vs_isr(struct isp_ccdc_device *ccdc)
 {
         struct isp_pipeline *pipe =
                 to_isp_pipeline(&ccdc->video_out.video.entity);
-        struct video_device *vdev = &ccdc->subdev.devnode;
+        struct video_device *vdev = ccdc->subdev.devnode;
         struct v4l2_event event;
 
         memset(&event, 0, sizeof(event));
@@ -2309,7 +2309,7 @@ void omap3isp_ccdc_cleanup(struct isp_device *isp)
         ccdc_lsc_free_queue(ccdc, &ccdc->lsc.free_queue);
 
         if (ccdc->fpc.fpcaddr != 0)
-                omap_iommu_vfree(isp->domain, isp->iommu, ccdc->fpc.fpcaddr);
+                omap_iommu_vfree(isp->domain, isp->dev, ccdc->fpc.fpcaddr);
 
         mutex_destroy(&ccdc->ioctl_lock);
 }
diff --git a/drivers/media/video/omap3isp/ispstat.c b/drivers/media/video/omap3isp/ispstat.c
index 68d539456c5..11871ecc6d2 100644
--- a/drivers/media/video/omap3isp/ispstat.c
+++ b/drivers/media/video/omap3isp/ispstat.c
@@ -366,7 +366,7 @@ static void isp_stat_bufs_free(struct ispstat *stat)
                                 dma_unmap_sg(isp->dev, buf->iovm->sgt->sgl,
                                              buf->iovm->sgt->nents,
                                              DMA_FROM_DEVICE);
-                        omap_iommu_vfree(isp->domain, isp->iommu,
+                        omap_iommu_vfree(isp->domain, isp->dev,
                                                         buf->iommu_addr);
                 } else {
                         if (!buf->virt_addr)
@@ -400,7 +400,7 @@ static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size)
                 struct iovm_struct *iovm;
 
                 WARN_ON(buf->dma_addr);
-                buf->iommu_addr = omap_iommu_vmalloc(isp->domain, isp->iommu, 0,
+                buf->iommu_addr = omap_iommu_vmalloc(isp->domain, isp->dev, 0,
                                                         size, IOMMU_FLAG);
                 if (IS_ERR((void *)buf->iommu_addr)) {
                         dev_err(stat->isp->dev,
@@ -410,7 +410,7 @@ static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size)
                         return -ENOMEM;
                 }
 
-                iovm = omap_find_iovm_area(isp->iommu, buf->iommu_addr);
+                iovm = omap_find_iovm_area(isp->dev, buf->iommu_addr);
                 if (!iovm ||
                     !dma_map_sg(isp->dev, iovm->sgt->sgl, iovm->sgt->nents,
                                 DMA_FROM_DEVICE)) {
@@ -419,7 +419,7 @@ static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size)
                 }
                 buf->iovm = iovm;
 
-                buf->virt_addr = omap_da_to_va(stat->isp->iommu,
+                buf->virt_addr = omap_da_to_va(stat->isp->dev,
                                           (u32)buf->iommu_addr);
                 buf->empty = 1;
                 dev_dbg(stat->isp->dev, "%s: buffer[%d] allocated."
@@ -496,7 +496,7 @@ static int isp_stat_bufs_alloc(struct ispstat *stat, u32 size)
 
 static void isp_stat_queue_event(struct ispstat *stat, int err)
 {
-        struct video_device *vdev = &stat->subdev.devnode;
+        struct video_device *vdev = stat->subdev.devnode;
         struct v4l2_event event;
         struct omap3isp_stat_event_status *status = (void *)event.u.data;
 
diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/video/omap3isp/ispvideo.c
index d1000723c5a..bd3aebafafa 100644
--- a/drivers/media/video/omap3isp/ispvideo.c
+++ b/drivers/media/video/omap3isp/ispvideo.c
@@ -26,6 +26,7 @@
 #include <asm/cacheflush.h>
 #include <linux/clk.h>
 #include <linux/mm.h>
+#include <linux/module.h>
 #include <linux/pagemap.h>
 #include <linux/scatterlist.h>
 #include <linux/sched.h>
@@ -452,7 +453,7 @@ ispmmu_vmap(struct isp_device *isp, const struct scatterlist *sglist, int sglen)
         sgt->nents = sglen;
         sgt->orig_nents = sglen;
 
-        da = omap_iommu_vmap(isp->domain, isp->iommu, 0, sgt, IOMMU_FLAG);
+        da = omap_iommu_vmap(isp->domain, isp->dev, 0, sgt, IOMMU_FLAG);
         if (IS_ERR_VALUE(da))
                 kfree(sgt);
 
@@ -468,7 +469,7 @@ static void ispmmu_vunmap(struct isp_device *isp, dma_addr_t da)
 {
         struct sg_table *sgt;
 
-        sgt = omap_iommu_vunmap(isp->domain, isp->iommu, (u32)da);
+        sgt = omap_iommu_vunmap(isp->domain, isp->dev, (u32)da);
         kfree(sgt);
 }