omap:iommu-disable TWL for ES1.0 by checking the CPU Revision

Disable TWL for ES1.0 by checking the CPU Revision

[Hari] - Amended the patch to move enabling/disabling of TWL
part to iommu_get function since this needs to be executed
only once.

Signed-off-by: Ramesh Gupta G <grgupta@ti.com>
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>

2 files changed, 7 insertions, 3 deletions

diff --git a/arch/arm/plat-omap/iommu.c b/arch/arm/plat-omap/iommu.c
index ec6e20c7643..aaf1ac8c738 100644
--- a/arch/arm/plat-omap/iommu.c
+++ b/arch/arm/plat-omap/iommu.c
@@ -853,6 +853,7 @@ struct iommu *iommu_get(const char *name)
         int err = -ENOMEM;
         struct device *dev;
         struct iommu *obj;
+        int rev;
         dev = driver_find_device(&omap_iommu_driver.driver, NULL, (void *)name,
                                  device_match_by_alias);
         if (!dev)
@@ -864,12 +865,16 @@ struct iommu *iommu_get(const char *name)
                 err = iommu_enable(obj);
                 if (err)
                         goto err_enable;
+                if (!strcmp(obj->name, "ducati")) {
+                        rev = GET_OMAP_REVISION();
+                        if (rev == 0x0)
+                                iommu_set_twl(obj, false);
+                }
+
                 flush_iotlb_all(obj);
         }
         if (!try_module_get(obj->owner))
                 goto err_module;
-
-        iommu_set_twl(obj, true);
         mutex_unlock(&obj->iommu_lock);
         dev_dbg(obj->dev, "%s: %s\n", __func__, obj->name);
         return obj;
diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c
index a95b5b24051..78684ed6acb 100644
--- a/arch/arm/plat-omap/iovmm.c
+++ b/arch/arm/plat-omap/iovmm.c
@@ -315,7 +315,6 @@ static int omap_iovmm_open(struct inode *inode, struct file *filp)
         filp->private_data = iodmm;
 
         return 0;
-
 }
 static int omap_iovmm_release(struct inode *inode, struct file *filp)
 {