6 files changed, 62 insertions, 31 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index f574dc012cad..620106937ec6 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -763,8 +763,7 @@ source "drivers/media/video/m5mols/Kconfig"
 
 config VIDEO_OMAP3
         tristate "OMAP 3 Camera support (EXPERIMENTAL)"
-        select OMAP_IOMMU
-        depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL
+        depends on OMAP_IOVMM && VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL
         ---help---
           Driver for an OMAP 3 camera controller.
 
diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c
index 5cea2bbd7014..a7ed98596883 100644
--- a/drivers/media/video/omap3isp/isp.c
+++ b/drivers/media/video/omap3isp/isp.c
@@ -80,6 +80,13 @@
 #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");
@@ -1108,7 +1115,7 @@ static void isp_save_ctx(struct isp_device *isp)
 {
         isp_save_context(isp, isp_reg_list);
         if (isp->iommu)
-                iommu_save_ctx(isp->iommu);
+                omap_iommu_save_ctx(isp->iommu);
 }
 
 /*
@@ -1122,7 +1129,7 @@ static void isp_restore_ctx(struct isp_device *isp)
 {
         isp_restore_context(isp, isp_reg_list);
         if (isp->iommu)
-                iommu_restore_ctx(isp->iommu);
+                omap_iommu_restore_ctx(isp->iommu);
         omap3isp_ccdc_restore_context(isp);
         omap3isp_preview_restore_context(isp);
 }
@@ -1975,7 +1982,8 @@ static int isp_remove(struct platform_device *pdev)
         isp_cleanup_modules(isp);
 
         omap3isp_get(isp);
-        iommu_put(isp->iommu);
+        iommu_detach_device(isp->domain, isp->iommu_dev);
+        iommu_domain_free(isp->domain);
         omap3isp_put(isp);
 
         free_irq(isp->irq_num, isp);
@@ -2123,25 +2131,41 @@ static int isp_probe(struct platform_device *pdev)
         }
 
         /* IOMMU */
-        isp->iommu = iommu_get("isp");
-        if (IS_ERR_OR_NULL(isp->iommu)) {
-                isp->iommu = NULL;
+        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");
+                ret = -ENOMEM;
+                goto error_isp;
+        }
+
+        ret = iommu_attach_device(isp->domain, isp->iommu_dev);
+        if (ret) {
+                dev_err(&pdev->dev, "can't attach iommu device: %d\n", ret);
+                goto free_domain;
+        }
+
         /* Interrupt */
         isp->irq_num = platform_get_irq(pdev, 0);
         if (isp->irq_num <= 0) {
                 dev_err(isp->dev, "No IRQ resource\n");
                 ret = -ENODEV;
-                goto error_isp;
+                goto detach_dev;
         }
 
         if (request_irq(isp->irq_num, isp_isr, IRQF_SHARED, "OMAP3 ISP", isp)) {
                 dev_err(isp->dev, "Unable to request IRQ\n");
                 ret = -EINVAL;
-                goto error_isp;
+                goto detach_dev;
         }
 
         /* Entities */
@@ -2162,8 +2186,11 @@ error_modules:
         isp_cleanup_modules(isp);
 error_irq:
         free_irq(isp->irq_num, isp);
+detach_dev:
+        iommu_detach_device(isp->domain, isp->iommu_dev);
+free_domain:
+        iommu_domain_free(isp->domain);
 error_isp:
-        iommu_put(isp->iommu);
         omap3isp_put(isp);
 error:
         isp_put_clocks(isp);
diff --git a/drivers/media/video/omap3isp/isp.h b/drivers/media/video/omap3isp/isp.h
index 529e582ef948..81fdd85deb60 100644
--- a/drivers/media/video/omap3isp/isp.h
+++ b/drivers/media/video/omap3isp/isp.h
@@ -32,6 +32,7 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/wait.h>
+#include <linux/iommu.h>
 #include <plat/iommu.h>
 #include <plat/iovmm.h>
 
@@ -294,7 +295,9 @@ struct isp_device {
         unsigned int sbl_resources;
         unsigned int subclk_resources;
 
-        struct iommu *iommu;
+        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 80796eb0c53e..892671922f8a 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)
-                iommu_vfree(isp->iommu, req->table);
+                omap_iommu_vfree(isp->domain, isp->iommu, req->table);
         kfree(req);
 }
 
@@ -438,15 +438,15 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc,
 
                 req->enable = 1;
 
-                req->table = iommu_vmalloc(isp->iommu, 0, req->config.size,
-                                           IOMMU_FLAG);
+                req->table = omap_iommu_vmalloc(isp->domain, isp->iommu, 0,
+                                        req->config.size, IOMMU_FLAG);
                 if (IS_ERR_VALUE(req->table)) {
                         req->table = 0;
                         ret = -ENOMEM;
                         goto done;
                 }
 
-                req->iovm = find_iovm_area(isp->iommu, req->table);
+                req->iovm = omap_find_iovm_area(isp->iommu, 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 = da_to_va(isp->iommu, req->table);
+                table = omap_da_to_va(isp->iommu, req->table);
                 if (copy_from_user(table, config->lsc, req->config.size)) {
                         ret = -EFAULT;
                         goto done;
@@ -731,18 +731,19 @@ static int ccdc_config(struct isp_ccdc_device *ccdc,
 
                         /*
                          * table_new must be 64-bytes aligned, but it's
-                         * already done by iommu_vmalloc().
+                         * already done by omap_iommu_vmalloc().
                          */
                         size = ccdc->fpc.fpnum * 4;
-                        table_new = iommu_vmalloc(isp->iommu, 0, size,
-                                                  IOMMU_FLAG);
+                        table_new = omap_iommu_vmalloc(isp->domain, isp->iommu,
+                                                        0, size, IOMMU_FLAG);
                         if (IS_ERR_VALUE(table_new))
                                 return -ENOMEM;
 
-                        if (copy_from_user(da_to_va(isp->iommu, table_new),
+                        if (copy_from_user(omap_da_to_va(isp->iommu, table_new),
                                            (__force void __user *)
                                            ccdc->fpc.fpcaddr, size)) {
-                                iommu_vfree(isp->iommu, table_new);
+                                omap_iommu_vfree(isp->domain, isp->iommu,
+                                                                table_new);
                                 return -EFAULT;
                         }
 
@@ -752,7 +753,7 @@ static int ccdc_config(struct isp_ccdc_device *ccdc,
 
                 ccdc_configure_fpc(ccdc);
                 if (table_old != 0)
-                        iommu_vfree(isp->iommu, table_old);
+                        omap_iommu_vfree(isp->domain, isp->iommu, table_old);
         }
 
         return ccdc_lsc_config(ccdc, ccdc_struct);
@@ -2287,5 +2288,5 @@ void omap3isp_ccdc_cleanup(struct isp_device *isp)
         ccdc_lsc_free_queue(ccdc, &ccdc->lsc.free_queue);
 
         if (ccdc->fpc.fpcaddr != 0)
-                iommu_vfree(isp->iommu, ccdc->fpc.fpcaddr);
+                omap_iommu_vfree(isp->domain, isp->iommu, ccdc->fpc.fpcaddr);
 }
diff --git a/drivers/media/video/omap3isp/ispstat.c b/drivers/media/video/omap3isp/ispstat.c
index 808065948ac1..732905552261 100644
--- a/drivers/media/video/omap3isp/ispstat.c
+++ b/drivers/media/video/omap3isp/ispstat.c
@@ -366,7 +366,8 @@ 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);
-                        iommu_vfree(isp->iommu, buf->iommu_addr);
+                        omap_iommu_vfree(isp->domain, isp->iommu,
+                                                        buf->iommu_addr);
                 } else {
                         if (!buf->virt_addr)
                                 continue;
@@ -399,8 +400,8 @@ 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 = iommu_vmalloc(isp->iommu, 0, size,
-                                                IOMMU_FLAG);
+                buf->iommu_addr = omap_iommu_vmalloc(isp->domain, isp->iommu, 0,
+                                                        size, IOMMU_FLAG);
                 if (IS_ERR((void *)buf->iommu_addr)) {
                         dev_err(stat->isp->dev,
                                  "%s: Can't acquire memory for "
@@ -409,7 +410,7 @@ static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size)
                         return -ENOMEM;
                 }
 
-                iovm = find_iovm_area(isp->iommu, buf->iommu_addr);
+                iovm = omap_find_iovm_area(isp->iommu, buf->iommu_addr);
                 if (!iovm ||
                     !dma_map_sg(isp->dev, iovm->sgt->sgl, iovm->sgt->nents,
                                 DMA_FROM_DEVICE)) {
@@ -418,7 +419,7 @@ static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size)
                 }
                 buf->iovm = iovm;
 
-                buf->virt_addr = da_to_va(stat->isp->iommu,
+                buf->virt_addr = omap_da_to_va(stat->isp->iommu,
                                           (u32)buf->iommu_addr);
                 buf->empty = 1;
                 dev_dbg(stat->isp->dev, "%s: buffer[%d] allocated."
diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/video/omap3isp/ispvideo.c
index fd965adfd597..912ac071b104 100644
--- a/drivers/media/video/omap3isp/ispvideo.c
+++ b/drivers/media/video/omap3isp/ispvideo.c
@@ -446,7 +446,7 @@ ispmmu_vmap(struct isp_device *isp, const struct scatterlist *sglist, int sglen)
         sgt->nents = sglen;
         sgt->orig_nents = sglen;
 
-        da = iommu_vmap(isp->iommu, 0, sgt, IOMMU_FLAG);
+        da = omap_iommu_vmap(isp->domain, isp->iommu, 0, sgt, IOMMU_FLAG);
         if (IS_ERR_VALUE(da))
                 kfree(sgt);
 
@@ -462,7 +462,7 @@ static void ispmmu_vunmap(struct isp_device *isp, dma_addr_t da)
 {
         struct sg_table *sgt;
 
-        sgt = iommu_vunmap(isp->iommu, (u32)da);
+        sgt = omap_iommu_vunmap(isp->domain, isp->iommu, (u32)da);
         kfree(sgt);
 }