diff options
| author | David Brown <davidb@codeaurora.org> | 2011-01-24 22:16:51 +0300 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-01-24 22:16:51 +0300 |
| commit | 75b0d32d5c0acd9b28f447aeddde5e94e5d64e5d (patch) | |
| tree | fc39655b6fcac0aea52db3c1d534b31efd42a7d4 /arch/arm/mach-msm/Kconfig | |
| parent | c243e5284371eb90af2c6771af60fa54c57513a4 (diff) | |
| parent | 50ede4e39aa5b61685ca87f58422478b1a538ca8 (diff) | |
| download | linux-75b0d32d5c0acd9b28f447aeddde5e94e5d64e5d.tar.xz | |
Merge branch 'msm-8960' into for-next
* msm-8960:
msm: Support for the MSM8960 RUMI3 target
msm: Support for the MSM8960 Simulator target
msm: Makefile cleanup
msm: timer: Timer support for MSM8960
msm: Add MSM 8960 cpu_is check
msm: irqs-8960: Interrupt map for MSM8960
msm: Physical offset for MSM8960
msm: io: I/O register definitions for MSM8960
msm: Generalize QGIC registers
msm: Generalize timer register mappings
msm: Add CPU queries
Diffstat (limited to 'arch/arm/mach-msm/Kconfig')
| -rw-r--r-- | arch/arm/mach-msm/Kconfig | 22 |
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 |