Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-msm / Kconfig

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 31e5fd63ec9a1cad215e329e0bf47c477135808d..fae931ac2e5685b6f2cf11fb39fe99f6fcac311b 100644 (file)
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -44,6 +44,7 @@ config ARCH_MSM8X60
        select CPU_V7
        select MSM_V2_TLMM
        select MSM_GPIOMUX
+       select IOMMU_API
 
 endchoice
 
@@ -124,6 +125,10 @@ config MACH_MSM8X60_FFA
 
 endmenu
 
+config IOMMU_PGTABLES_L2
+       def_bool y
+       depends on ARCH_MSM8X60 && MMU && SMP && CPU_DCACHE_DISABLE=n
+
 config MSM_DEBUG_UART
        int
        default 1 if MSM_DEBUG_UART1
@@ -164,4 +169,7 @@ config MSM_GPIOMUX
 
 config MSM_V2_TLMM
        bool
+
+config IOMMU_API
+       bool
 endif