iommu/omap: Migrate to hwmod framework

Use hwmod data and device attributes to build and register an
omap device for iommu driver.

 - Update the naming convention in isp module.
 - Remove unneeded check for number of resources, as this is now
   handled by omap_device and prevents driver from loading.
 - Now unused, remove platform device and resource data, handling
   of sysconfig register for softreset purposes, use default
   latency structure.
 - Use hwmod API for reset handling.

Signed-off-by: Omar Ramirez Luna <omar.luna@linaro.org>
Tested-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Joerg Roedel <joro@8bytes.org>

2 files changed, 39 insertions, 131 deletions

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index c15f5a97b51c..787a996ec4eb 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -214,7 +214,7 @@ static struct platform_device omap3isp_device = {
 };
 
 static struct omap_iommu_arch_data omap3_isp_iommu = {
-        .name = "isp",
+        .name = "mmu_isp",
 };
 
 int omap3_init_camera(struct isp_platform_data *pdata)
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index a6a4ff8744b7..02726a647b1d 100644
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -12,153 +12,61 @@
 
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/err.h>
+#include <linux/slab.h>
 
 #include <linux/platform_data/iommu-omap.h>
+#include <plat/omap_hwmod.h>
+#include <plat/omap_device.h>
 
-#include "soc.h"
-#include "common.h"
-
-struct iommu_device {
-        resource_size_t base;
-        int irq;
-        struct iommu_platform_data pdata;
-        struct resource res[2];
-};
-static struct iommu_device *devices;
-static int num_iommu_devices;
-
-#ifdef CONFIG_ARCH_OMAP3
-static struct iommu_device omap3_devices[] = {
-        {
-                .base = 0x480bd400,
-                .irq = 24 + OMAP_INTC_START,
-                .pdata = {
-                        .name = "isp",
-                        .nr_tlb_entries = 8,
-                        .clk_name = "cam_ick",
-                        .da_start = 0x0,
-                        .da_end = 0xFFFFF000,
-                },
-        },
-#if defined(CONFIG_OMAP_IOMMU_IVA2)
-        {
-                .base = 0x5d000000,
-                .irq = 28 + OMAP_INTC_START,
-                .pdata = {
-                        .name = "iva2",
-                        .nr_tlb_entries = 32,
-                        .clk_name = "iva2_ck",
-                        .da_start = 0x11000000,
-                        .da_end = 0xFFFFF000,
-                },
-        },
-#endif
-};
-#define NR_OMAP3_IOMMU_DEVICES ARRAY_SIZE(omap3_devices)
-static struct platform_device *omap3_iommu_pdev[NR_OMAP3_IOMMU_DEVICES];
-#else
-#define omap3_devices           NULL
-#define NR_OMAP3_IOMMU_DEVICES  0
-#define omap3_iommu_pdev        NULL
-#endif
-
-#ifdef CONFIG_ARCH_OMAP4
-static struct iommu_device omap4_devices[] = {
-        {
-                .base = OMAP4_MMU1_BASE,
-                .irq = 100 + OMAP44XX_IRQ_GIC_START,
-                .pdata = {
-                        .name = "ducati",
-                        .nr_tlb_entries = 32,
-                        .clk_name = "ipu_fck",
-                        .da_start = 0x0,
-                        .da_end = 0xFFFFF000,
-                },
-        },
-        {
-                .base = OMAP4_MMU2_BASE,
-                .irq = 28 + OMAP44XX_IRQ_GIC_START,
-                .pdata = {
-                        .name = "tesla",
-                        .nr_tlb_entries = 32,
-                        .clk_name = "dsp_fck",
-                        .da_start = 0x0,
-                        .da_end = 0xFFFFF000,
-                },
-        },
-};
-#define NR_OMAP4_IOMMU_DEVICES ARRAY_SIZE(omap4_devices)
-static struct platform_device *omap4_iommu_pdev[NR_OMAP4_IOMMU_DEVICES];
-#else
-#define omap4_devices           NULL
-#define NR_OMAP4_IOMMU_DEVICES  0
-#define omap4_iommu_pdev        NULL
-#endif
-
-static struct platform_device **omap_iommu_pdev;
-
-static int __init omap_iommu_init(void)
+static int __init omap_iommu_dev_init(struct omap_hwmod *oh, void *unused)
 {
-        int i, err;
-        struct resource res[] = {
-                { .flags = IORESOURCE_MEM },
-                { .flags = IORESOURCE_IRQ },
-        };
+        struct platform_device *pdev;
+        struct iommu_platform_data *pdata;
+        struct omap_mmu_dev_attr *a = (struct omap_mmu_dev_attr *)oh->dev_attr;
+        static int i;
+
+        pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+        if (!pdata)
+                return -ENOMEM;
+
+        pdata->name = oh->name;
+        pdata->clk_name = oh->main_clk;
+        pdata->nr_tlb_entries = a->nr_tlb_entries;
+        pdata->da_start = a->da_start;
+        pdata->da_end = a->da_end;
+
+        if (oh->rst_lines_cnt == 1) {
+                pdata->reset_name = oh->rst_lines->name;
+                pdata->assert_reset = omap_device_assert_hardreset;
+                pdata->deassert_reset = omap_device_deassert_hardreset;
+        }
 
-        if (cpu_is_omap34xx()) {
-                devices = omap3_devices;
-                omap_iommu_pdev = omap3_iommu_pdev;
-                num_iommu_devices = NR_OMAP3_IOMMU_DEVICES;
-        } else if (cpu_is_omap44xx()) {
-                devices = omap4_devices;
-                omap_iommu_pdev = omap4_iommu_pdev;
-                num_iommu_devices = NR_OMAP4_IOMMU_DEVICES;
-        } else
-                return -ENODEV;
+        pdev = omap_device_build("omap-iommu", i, oh, pdata, sizeof(*pdata),
+                                NULL, 0, 0);
 
-        for (i = 0; i < num_iommu_devices; i++) {
-                struct platform_device *pdev;
-                const struct iommu_device *d = &devices[i];
+        kfree(pdata);
 
-                pdev = platform_device_alloc("omap-iommu", i);
-                if (!pdev) {
-                        err = -ENOMEM;
-                        goto err_out;
-                }
+        if (IS_ERR(pdev)) {
+                pr_err("%s: device build err: %ld\n", __func__, PTR_ERR(pdev));
+                return PTR_ERR(pdev);
+        }
 
-                res[0].start = d->base;
-                res[0].end = d->base + MMU_REG_SIZE - 1;
-                res[1].start = res[1].end = d->irq;
+        i++;
 
-                err = platform_device_add_resources(pdev, res,
-                                                    ARRAY_SIZE(res));
-                if (err)
-                        goto err_out;
-                err = platform_device_add_data(pdev, &d->pdata,
-                                               sizeof(d->pdata));
-                if (err)
-                        goto err_out;
-                err = platform_device_add(pdev);
-                if (err)
-                        goto err_out;
-                omap_iommu_pdev[i] = pdev;
-        }
         return 0;
+}
 
-err_out:
-        while (i--)
-                platform_device_put(omap_iommu_pdev[i]);
-        return err;
+static int __init omap_iommu_init(void)
+{
+        return omap_hwmod_for_each_by_class("mmu", omap_iommu_dev_init, NULL);
 }
 /* must be ready before omap3isp is probed */
 subsys_initcall(omap_iommu_init);
 
 static void __exit omap_iommu_exit(void)
 {
-        int i;
-
-        for (i = 0; i < num_iommu_devices; i++)
-                platform_device_unregister(omap_iommu_pdev[i]);
+        /* Do nothing */
 }
 module_exit(omap_iommu_exit);