1 files changed, 8 insertions, 4 deletions

diff --git a/arch/arm/mach-omap2/iommu2.c b/arch/arm/mach-omap2/iommu2.c
index e82da680d908..ebbdae262f78 100644
--- a/arch/arm/mach-omap2/iommu2.c
+++ b/arch/arm/mach-omap2/iommu2.c
@@ -44,9 +44,13 @@
 #define MMU_IRQ_EMUMISS         (1 << 2)
 #define MMU_IRQ_TRANSLATIONFAULT        (1 << 1)
 #define MMU_IRQ_TLBMISS         (1 << 0)
-#define MMU_IRQ_MASK    \
-        (MMU_IRQ_MULTIHITFAULT | MMU_IRQ_TABLEWALKFAULT | MMU_IRQ_EMUMISS | \
-         MMU_IRQ_TRANSLATIONFAULT)
+
+#define __MMU_IRQ_FAULT         \
+        (MMU_IRQ_MULTIHITFAULT | MMU_IRQ_EMUMISS | MMU_IRQ_TRANSLATIONFAULT)
+#define MMU_IRQ_MASK            \
+        (__MMU_IRQ_FAULT | MMU_IRQ_TABLEWALKFAULT | MMU_IRQ_TLBMISS)
+#define MMU_IRQ_TWL_MASK        (__MMU_IRQ_FAULT | MMU_IRQ_TABLEWALKFAULT)
+#define MMU_IRQ_TLB_MISS_MASK   (__MMU_IRQ_FAULT | MMU_IRQ_TLBMISS)
 
 /* MMU_CNTL */
 #define MMU_CNTL_SHIFT          1
@@ -96,7 +100,7 @@ static int omap2_iommu_enable(struct iommu *obj)
         l |= (MMU_SYS_IDLE_SMART | MMU_SYS_AUTOIDLE);
         iommu_write_reg(obj, l, MMU_SYSCONFIG);
 
-        iommu_write_reg(obj, MMU_IRQ_MASK, MMU_IRQENABLE);
+        iommu_write_reg(obj, MMU_IRQ_TWL_MASK, MMU_IRQENABLE);
         iommu_write_reg(obj, pa, MMU_TTB);
 
         l = iommu_read_reg(obj, MMU_CNTL);