1 files changed, 36 insertions, 9 deletions

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);