Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / arm / mach-omap2 / omap-iommu.c

diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index eb9bee7..3fc5dc7 100644 (file)
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -33,9 +33,11 @@ static struct iommu_device omap3_devices[] = {
                        .name = "isp",
                        .nr_tlb_entries = 8,
                        .clk_name = "cam_ick",
+                       .da_start = 0x0,
+                       .da_end = 0xFFFFF000,
                },
        },
-#if defined(CONFIG_MPU_BRIDGE_IOMMU)
+#if defined(CONFIG_OMAP_IOMMU_IVA2)
        {
                .base = 0x5d000000,
                .irq = 28,
@@ -43,6 +45,8 @@ static struct iommu_device omap3_devices[] = {
                        .name = "iva2",
                        .nr_tlb_entries = 32,
                        .clk_name = "iva2_ck",
+                       .da_start = 0x11000000,
+                       .da_end = 0xFFFFF000,
                },
        },
 #endif
@@ -59,11 +63,13 @@ static struct platform_device *omap3_iommu_pdev[NR_OMAP3_IOMMU_DEVICES];
 static struct iommu_device omap4_devices[] = {
        {
                .base = OMAP4_MMU1_BASE,
-               .irq = INT_44XX_DUCATI_MMU_IRQ,
+               .irq = OMAP44XX_IRQ_DUCATI_MMU,
                .pdata = {
                        .name = "ducati",
                        .nr_tlb_entries = 32,
                        .clk_name = "ducati_ick",
+                       .da_start = 0x0,
+                       .da_end = 0xFFFFF000,
                },
        },
 #if defined(CONFIG_MPU_TESLA_IOMMU)
@@ -74,6 +80,8 @@ static struct iommu_device omap4_devices[] = {
                        .name = "tesla",
                        .nr_tlb_entries = 32,
                        .clk_name = "tesla_ick",
+                       .da_start = 0x0,
+                       .da_end = 0xFFFFF000,
                },
        },
 #endif