aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iommu/omap-iommu.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2014-07-18 06:49:55 -0400
committerJoerg Roedel <jroedel@suse.de>2014-07-29 06:38:07 -0400
commitbaaa7b5d4f1e515a39f1eebd5fb16b67e00b22fb (patch)
tree99c1c7ae45cc7fa7efb4bc5d6ee7570c0ec0605b /drivers/iommu/omap-iommu.c
parent0f198890105b346c975dc0380a98b5d05b5e8a7b (diff)
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.c13
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)
959 return err; 959 return err;
960 if (obj->nr_tlb_entries != 32 && obj->nr_tlb_entries != 8) 960 if (obj->nr_tlb_entries != 32 && obj->nr_tlb_entries != 8)
961 return -EINVAL; 961 return -EINVAL;
962 /*
963 * da_start and da_end are needed for omap-iovmm, so hardcode
964 * these values as used by OMAP3 ISP - the only user for
965 * omap-iovmm
966 */
967 obj->da_start = 0;
968 obj->da_end = 0xfffff000;
969 if (of_find_property(of, "ti,iommu-bus-err-back", NULL)) 962 if (of_find_property(of, "ti,iommu-bus-err-back", NULL))
970 obj->has_bus_err_back = MMU_GP_REG_BUS_ERR_BACK_EN; 963 obj->has_bus_err_back = MMU_GP_REG_BUS_ERR_BACK_EN;
971 } else { 964 } else {
972 obj->nr_tlb_entries = pdata->nr_tlb_entries; 965 obj->nr_tlb_entries = pdata->nr_tlb_entries;
973 obj->name = pdata->name; 966 obj->name = pdata->name;
974 obj->da_start = pdata->da_start;
975 obj->da_end = pdata->da_end;
976 } 967 }
977 if (obj->da_end <= obj->da_start)
978 return -EINVAL;
979 968
980 obj->dev = &pdev->dev; 969 obj->dev = &pdev->dev;
981 obj->ctx = (void *)obj + sizeof(*obj); 970 obj->ctx = (void *)obj + sizeof(*obj);
982 971
983 spin_lock_init(&obj->iommu_lock); 972 spin_lock_init(&obj->iommu_lock);
984 mutex_init(&obj->mmap_lock);
985 spin_lock_init(&obj->page_table_lock); 973 spin_lock_init(&obj->page_table_lock);
986 INIT_LIST_HEAD(&obj->mmap);
987 974
988 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 975 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
989 obj->regbase = devm_ioremap_resource(obj->dev, res); 976 obj->regbase = devm_ioremap_resource(obj->dev, res);