Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

[pandora-kernel.git] / arch / arm / mach-msm / Kconfig

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 5d3d9ad..1516896 100644 (file)
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -45,7 +45,16 @@ config ARCH_MSM8X60
        select CPU_V7
        select MSM_V2_TLMM
        select MSM_GPIOMUX
-       select IOMMU_API
+       select MSM_SCM if SMP
+
+config ARCH_MSM8960
+       bool "MSM8960"
+       select ARCH_MSM_SCORPIONMP
+       select MACH_MSM8960_SIM if (!MACH_MSM8960_RUMI3)
+       select ARM_GIC
+       select CPU_V7
+       select MSM_V2_TLMM
+       select MSM_GPIOMUX
        select MSM_SCM if SMP
 
 endchoice
@@ -125,11 +134,35 @@ config MACH_MSM8X60_FFA
        help
          Support for the Qualcomm MSM8x60 FFA eval board.
 
+config MACH_MSM8960_SIM
+       depends on ARCH_MSM8960
+       bool "MSM8960 Simulator"
+       help
+         Support for the Qualcomm MSM8960 simulator.
+
+config MACH_MSM8960_RUMI3
+       depends on ARCH_MSM8960
+       bool "MSM8960 RUMI3"
+       help
+         Support for the Qualcomm MSM8960 RUMI3 emulator.
+
 endmenu
 
+config MSM_IOMMU
+       bool "MSM IOMMU Support"
+       depends on ARCH_MSM8X60 || ARCH_MSM8960
+       select IOMMU_API
+       default n
+       help
+         Support for the IOMMUs found on certain Qualcomm SOCs.
+         These IOMMUs allow virtualization of the address space used by most
+         cores within the multimedia subsystem.
+
+         If unsure, say N here.
+
 config IOMMU_PGTABLES_L2
        def_bool y
-       depends on ARCH_MSM8X60 && MMU && SMP && CPU_DCACHE_DISABLE=n
+       depends on MSM_IOMMU && MMU && SMP && CPU_DCACHE_DISABLE=n
 
 config MSM_DEBUG_UART
        int