1 files changed, 22 insertions, 0 deletions

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 5d3d9ade12fb..df9d74eaa472 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -48,6 +48,16 @@ config ARCH_MSM8X60
         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
 
 config MSM_SOC_REV_A
@@ -125,6 +135,18 @@ 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 IOMMU_PGTABLES_L2