Merge commit 'v2.6.39' into 20110526
[linux-2.6.git] / arch / arm / mach-msm / Kconfig
index 3d74a73..1516896 100644 (file)
@@ -21,7 +21,6 @@ config ARCH_MSM7X30
        select MSM_SMD
        select MSM_VIC
        select CPU_V7
-       select MSM_REMOTE_SPINLOCK_DEKKERS
        select MSM_GPIOMUX
        select MSM_PROC_COMM
        select HAS_MSM_DEBUG_UART_PHYS
@@ -33,7 +32,6 @@ config ARCH_QSD8X50
        select MSM_SMD
        select MSM_VIC
        select CPU_V7
-       select MSM_REMOTE_SPINLOCK_LDREX
        select MSM_GPIOMUX
        select MSM_PROC_COMM
        select HAS_MSM_DEBUG_UART_PHYS
@@ -42,15 +40,29 @@ config ARCH_MSM8X60
        bool "MSM8X60"
        select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM \
                                  && !MACH_MSM8X60_FFA)
+       select ARCH_MSM_SCORPIONMP
        select ARM_GIC
        select CPU_V7
        select MSM_V2_TLMM
        select MSM_GPIOMUX
+       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
        bool
+config  ARCH_MSM_SCORPIONMP
+       bool
 
 config  ARCH_MSM_ARM11
        bool
@@ -122,8 +134,36 @@ 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 MSM_IOMMU && MMU && SMP && CPU_DCACHE_DISABLE=n
+
 config MSM_DEBUG_UART
        int
        default 1 if MSM_DEBUG_UART1
@@ -164,4 +204,10 @@ config MSM_GPIOMUX
 
 config MSM_V2_TLMM
        bool
+
+config IOMMU_API
+       bool
+
+config MSM_SCM
+       bool
 endif