Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[linux-2.6-microblaze.git] / drivers / iommu / omap-iommu.c

diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 031b247..e202b0c 100644 (file)
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -959,31 +959,18 @@ static int omap_iommu_probe(struct platform_device *pdev)
                        return err;
                if (obj->nr_tlb_entries != 32 && obj->nr_tlb_entries != 8)
                        return -EINVAL;
-               /*
-                * da_start and da_end are needed for omap-iovmm, so hardcode
-                * these values as used by OMAP3 ISP - the only user for
-                * omap-iovmm
-                */
-               obj->da_start = 0;
-               obj->da_end = 0xfffff000;
                if (of_find_property(of, "ti,iommu-bus-err-back", NULL))
                        obj->has_bus_err_back = MMU_GP_REG_BUS_ERR_BACK_EN;
        } else {
                obj->nr_tlb_entries = pdata->nr_tlb_entries;
                obj->name = pdata->name;
-               obj->da_start = pdata->da_start;
-               obj->da_end = pdata->da_end;
        }
-       if (obj->da_end <= obj->da_start)
-               return -EINVAL;
 
        obj->dev = &pdev->dev;
        obj->ctx = (void *)obj + sizeof(*obj);
 
        spin_lock_init(&obj->iommu_lock);
-       mutex_init(&obj->mmap_lock);
        spin_lock_init(&obj->page_table_lock);
-       INIT_LIST_HEAD(&obj->mmap);
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        obj->regbase = devm_ioremap_resource(obj->dev, res);