omap iommu: support for OMAP4

This patch provides the iommu support for OMAP4 co-processors.

Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index 416a65d5c4a96c1cf03bb8af8bf448768561eccc..eb9bee73e0cb6cad0e23dcfacdcc5e8f354cd8bd 100644 (file)
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -13,6 +13,7 @@
 #include <linux/platform_device.h>
 
 #include <plat/iommu.h>
+#include <plat/irqs.h>
 
 struct iommu_device {
        resource_size_t base;
@@ -20,9 +21,11 @@ struct iommu_device {
        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 devices[] = {
+static struct iommu_device omap3_devices[] = {
        {
                .base = 0x480bd400,
                .irq = 24,
@@ -44,11 +47,46 @@ static struct iommu_device devices[] = {
        },
 #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
 
-#define NR_IOMMU_DEVICES ARRAY_SIZE(devices)
+#ifdef CONFIG_ARCH_OMAP4
+static struct iommu_device omap4_devices[] = {
+       {
+               .base = OMAP4_MMU1_BASE,
+               .irq = INT_44XX_DUCATI_MMU_IRQ,
+               .pdata = {
+                       .name = "ducati",
+                       .nr_tlb_entries = 32,
+                       .clk_name = "ducati_ick",
+               },
+       },
+#if defined(CONFIG_MPU_TESLA_IOMMU)
+       {
+               .base = OMAP4_MMU2_BASE,
+               .irq = INT_44XX_DSP_MMU,
+               .pdata = {
+                       .name = "tesla",
+                       .nr_tlb_entries = 32,
+                       .clk_name = "tesla_ick",
+               },
+       },
+#endif
+};
+#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[NR_IOMMU_DEVICES];
+static struct platform_device **omap_iommu_pdev;
 
 static int __init omap_iommu_init(void)
 {
@@ -58,7 +96,18 @@ static int __init omap_iommu_init(void)
                { .flags = IORESOURCE_IRQ },
        };
 
-       for (i = 0; i < NR_IOMMU_DEVICES; i++) {
+       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;
+
+       for (i = 0; i < num_iommu_devices; i++) {
                struct platform_device *pdev;
                const struct iommu_device *d = &devices[i];
 
@@ -98,7 +147,7 @@ static void __exit omap_iommu_exit(void)
 {
        int i;
 
-       for (i = 0; i < NR_IOMMU_DEVICES; i++)
+       for (i = 0; i < num_iommu_devices; i++)
                platform_device_unregister(omap_iommu_pdev[i]);
 }
 module_exit(omap_iommu_exit);

diff --git a/arch/arm/plat-omap/include/plat/omap44xx.h b/arch/arm/plat-omap/include/plat/omap44xx.h
index b3ef1a7f53cc84f19e3901143fb8e14468db418e..bb94a0baee8a64ba82208e2de136bb25a6ad70a4 100644 (file)
--- a/arch/arm/plat-omap/include/plat/omap44xx.h
+++ b/arch/arm/plat-omap/include/plat/omap44xx.h
@@ -48,5 +48,8 @@
 #define OMAP44XX_MAILBOX_BASE          (L4_44XX_BASE + 0xF4000)
 #define OMAP44XX_HSUSB_OTG_BASE                (L4_44XX_BASE + 0xAB000)
 
+#define OMAP4_MMU1_BASE                        0x55082000
+#define OMAP4_MMU2_BASE                        0x4A066000
+
 #endif /* __ASM_ARCH_OMAP44XX_H */