Merge branches 'arm/exynos', 'arm/renesas', 'arm/rockchip', 'arm/omap', 'arm/mediatek...

[linux-2.6-microblaze.git] / drivers / iommu / Kconfig

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index e163b02..49bd2ab 100644 (file)
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -255,6 +255,7 @@ config TEGRA_IOMMU_SMMU
 config EXYNOS_IOMMU
        bool "Exynos IOMMU Support"
        depends on ARCH_EXYNOS && MMU
+       depends on !CPU_BIG_ENDIAN # revisit driver if we can enable big-endian ptes
        select IOMMU_API
        select ARM_DMA_USE_IOMMU
        help
@@ -369,4 +370,14 @@ config MTK_IOMMU_V1
 
          if unsure, say N here.
 
+config QCOM_IOMMU
+       # Note: iommu drivers cannot (yet?) be built as modules
+       bool "Qualcomm IOMMU Support"
+       depends on ARCH_QCOM || COMPILE_TEST
+       select IOMMU_API
+       select IOMMU_IO_PGTABLE_LPAE
+       select ARM_DMA_USE_IOMMU
+       help
+         Support for IOMMU on certain Qualcomm SoCs.
+
 endif # IOMMU_SUPPORT