diff options
| author | Laurent Pinchart | 2014-07-18 12:49:55 +0200 |
|---|---|---|
| committer | Joerg Roedel | 2014-07-29 12:38:07 +0200 |
| commit | baaa7b5d4f1e515a39f1eebd5fb16b67e00b22fb (patch) | |
| tree | 99c1c7ae45cc7fa7efb4bc5d6ee7570c0ec0605b /drivers/iommu/omap-iommu.c | |
| parent | iommu/omap: Use PAGE_ALIGNED instead of IS_ALIGNED(PAGE_SIZE) (diff) | |
| download | kernel-qcow2-linux-baaa7b5d4f1e515a39f1eebd5fb16b67e00b22fb.tar.gz kernel-qcow2-linux-baaa7b5d4f1e515a39f1eebd5fb16b67e00b22fb.tar.xz kernel-qcow2-linux-baaa7b5d4f1e515a39f1eebd5fb16b67e00b22fb.zip | |
iommu/omap: Remove virtual memory manager
The OMAP3 ISP driver was the only user of the OMAP IOVMM API. Now that
is has been ported to the DMA API, remove the unused virtual memory
manager.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/omap-iommu.c')
| -rw-r--r-- | drivers/iommu/omap-iommu.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index 895af06a667f..61599e2b33ca 100644 --- 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); |