Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif...

[cascardo/linux.git] / drivers / iommu / omap-iommu.h

diff --git a/drivers/iommu/omap-iommu.h b/drivers/iommu/omap-iommu.h
index 1200842..ea920c3 100644 (file)
--- a/drivers/iommu/omap-iommu.h
+++ b/drivers/iommu/omap-iommu.h
@@ -52,6 +52,8 @@ struct omap_iommu {
        void *ctx; /* iommu context: registres saved area */
        u32 da_start;
        u32 da_end;
+
+       int has_bus_err_back;
 };
 
 struct cr_regs {
@@ -130,6 +132,7 @@ static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev)
 #define MMU_READ_CAM           0x68
 #define MMU_READ_RAM           0x6c
 #define MMU_EMU_FAULT_AD       0x70
+#define MMU_GP_REG             0x88
 
 #define MMU_REG_SIZE           256
 
@@ -163,6 +166,8 @@ static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev)
 #define MMU_RAM_MIXED_MASK     (1 << MMU_RAM_MIXED_SHIFT)
 #define MMU_RAM_MIXED          MMU_RAM_MIXED_MASK
 
+#define MMU_GP_REG_BUS_ERR_BACK_EN     0x1
+
 /*
  * utilities for super page(16MB, 1MB, 64KB and 4KB)
  */