Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 9 insertions, 1 deletions

diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index f5a1aad1a5c0..3fc5dc7233da 100644
--- 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
@@ -64,6 +68,8 @@ static struct iommu_device omap4_devices[] = {
                         .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