Merge tag 'iommu-config-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / iommu / Kconfig

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 6d13f96..325188e 100644 (file)
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -144,13 +144,26 @@ config OMAP_IOMMU
        select IOMMU_API
 
 config OMAP_IOMMU_DEBUG
-       tristate "Export OMAP IOMMU internals in DebugFS"
-       depends on OMAP_IOMMU && DEBUG_FS
-       help
-         Select this to see extensive information about
-         the internal state of OMAP IOMMU in debugfs.
+       bool "Export OMAP IOMMU internals in DebugFS"
+       depends on OMAP_IOMMU && DEBUG_FS
+       ---help---
+         Select this to see extensive information about
+         the internal state of OMAP IOMMU in debugfs.
 
-         Say N unless you know you need this.
+         Say N unless you know you need this.
+
+config ROCKCHIP_IOMMU
+       bool "Rockchip IOMMU Support"
+       depends on ARM
+       depends on ARCH_ROCKCHIP || COMPILE_TEST
+       select IOMMU_API
+       select ARM_DMA_USE_IOMMU
+       help
+         Support for IOMMUs found on Rockchip rk32xx SOCs.
+         These IOMMUs allow virtualization of the address space used by most
+         cores within the multimedia subsystem.
+         Say Y here if you are using a Rockchip SoC that includes an IOMMU
+         device.
 
 config TEGRA_IOMMU_GART
        bool "Tegra GART IOMMU Support"
@@ -163,18 +176,18 @@ config TEGRA_IOMMU_GART
          hardware included on Tegra SoCs.
 
 config TEGRA_IOMMU_SMMU
-       bool "Tegra SMMU IOMMU Support"
-       depends on ARCH_TEGRA && TEGRA_AHB
+       bool "NVIDIA Tegra SMMU Support"
+       depends on ARCH_TEGRA
+       depends on TEGRA_AHB
+       depends on TEGRA_MC
        select IOMMU_API
        help
-         Enables support for remapping discontiguous physical memory
-         shared with the operating system into contiguous I/O virtual
-         space through the SMMU (System Memory Management Unit)
-         hardware included on Tegra SoCs.
+         This driver supports the IOMMU hardware (SMMU) found on NVIDIA Tegra
+         SoCs (Tegra30 up to Tegra124).
 
 config EXYNOS_IOMMU
        bool "Exynos IOMMU Support"
-       depends on ARCH_EXYNOS
+       depends on ARCH_EXYNOS && ARM
        select IOMMU_API
        select ARM_DMA_USE_IOMMU
        help