iommu/omap: Drop legacy-style device support

All the supported boards that have OMAP IOMMU devices do support
DT boot only now. So, drop the support for the non-DT legacy-style
devices from the OMAP IOMMU driver. Couple of the fields from the
iommu platform data would no longer be required, so they have also
been cleaned up. The IOMMU platform data is still needed though for
performing reset management properly in a multi-arch environment.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 54556713c8d161cdd2a11c1e5a0955d97e92fa38..febd4fbe3445a02a45fb4138c65c1edeb54edb68 100644 (file)
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -928,28 +928,26 @@ static int omap_iommu_probe(struct platform_device *pdev)
        int irq;
        struct omap_iommu *obj;
        struct resource *res;
-       struct iommu_platform_data *pdata = dev_get_platdata(&pdev->dev);
        struct device_node *of = pdev->dev.of_node;
 
+       if (!of) {
+               pr_err("%s: only DT-based devices are supported\n", __func__);
+               return -ENODEV;
+       }
+
        obj = devm_kzalloc(&pdev->dev, sizeof(*obj) + MMU_REG_SIZE, GFP_KERNEL);
        if (!obj)
                return -ENOMEM;
 
-       if (of) {
-               obj->name = dev_name(&pdev->dev);
-               obj->nr_tlb_entries = 32;
-               err = of_property_read_u32(of, "ti,#tlb-entries",
-                                          &obj->nr_tlb_entries);
-               if (err && err != -EINVAL)
-                       return err;
-               if (obj->nr_tlb_entries != 32 && obj->nr_tlb_entries != 8)
-                       return -EINVAL;
-               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->name = dev_name(&pdev->dev);
+       obj->nr_tlb_entries = 32;
+       err = of_property_read_u32(of, "ti,#tlb-entries", &obj->nr_tlb_entries);
+       if (err && err != -EINVAL)
+               return err;
+       if (obj->nr_tlb_entries != 32 && obj->nr_tlb_entries != 8)
+               return -EINVAL;
+       if (of_find_property(of, "ti,iommu-bus-err-back", NULL))
+               obj->has_bus_err_back = MMU_GP_REG_BUS_ERR_BACK_EN;
 
        obj->dev = &pdev->dev;
        obj->ctx = (void *)obj + sizeof(*obj);

diff --git a/include/linux/platform_data/iommu-omap.h b/include/linux/platform_data/iommu-omap.h
index 0496d171700a767b13b89e8e73c50b043fcf6c64..a40fc0f4f9dec88b38d600d075076d163de22b17 100644 (file)
--- a/include/linux/platform_data/iommu-omap.h
+++ b/include/linux/platform_data/iommu-omap.h
@@ -30,10 +30,7 @@ struct omap_iommu_arch_data {
 };
 
 struct iommu_platform_data {
-       const char *name;
        const char *reset_name;
-       int nr_tlb_entries;
-
        int (*assert_reset)(struct platform_device *pdev, const char *name);
        int (*deassert_reset)(struct platform_device *pdev, const char *name);
 };