Merge branches 'iommu/fixes', 'arm/omap', 'arm/smmu', 'arm/shmobile', 'x86/amd',...

[karo-tx-linux.git] / drivers / iommu / Kconfig

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index df56e4c74a7e450aae8820d4b7d6837c897c781b..d260605e6d5fb1b0cb6ca30c5d7e960ab43b4999 100644 (file)
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -178,13 +178,13 @@ config TEGRA_IOMMU_SMMU
 
 config EXYNOS_IOMMU
        bool "Exynos IOMMU Support"
-       depends on ARCH_EXYNOS && EXYNOS_DEV_SYSMMU
+       depends on ARCH_EXYNOS
        select IOMMU_API
        help
-         Support for the IOMMU(System MMU) of Samsung Exynos application
-         processor family. This enables H/W multimedia accellerators to see
-         non-linear physical memory chunks as a linear memory in their
-         address spaces
+         Support for the IOMMU (System MMU) of Samsung Exynos application
+         processor family. This enables H/W multimedia accelerators to see
+         non-linear physical memory chunks as linear memory in their
+         address space.
 
          If unsure, say N here.
 
@@ -193,9 +193,9 @@ config EXYNOS_IOMMU_DEBUG
        depends on EXYNOS_IOMMU
        help
          Select this to see the detailed log message that shows what
-         happens in the IOMMU driver
+         happens in the IOMMU driver.
 
-         Say N unless you need kernel log message for IOMMU debugging
+         Say N unless you need kernel log message for IOMMU debugging.
 
 config SHMOBILE_IPMMU
        bool
@@ -272,6 +272,18 @@ config SHMOBILE_IOMMU_L1SIZE
        default 256 if SHMOBILE_IOMMU_ADDRSIZE_64MB
        default 128 if SHMOBILE_IOMMU_ADDRSIZE_32MB
 
+config IPMMU_VMSA
+       bool "Renesas VMSA-compatible IPMMU"
+       depends on ARM_LPAE
+       depends on ARCH_SHMOBILE || COMPILE_TEST
+       select IOMMU_API
+       select ARM_DMA_USE_IOMMU
+       help
+         Support for the Renesas VMSA-compatible IPMMU Renesas found in the
+         R-Mobile APE6 and R-Car H2/M2 SoCs.
+
+         If unsure, say N.
+
 config SPAPR_TCE_IOMMU
        bool "sPAPR TCE IOMMU Support"
        depends on PPC_POWERNV || PPC_PSERIES