aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-msm/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-msm/Kconfig')
-rw-r--r--arch/arm/mach-msm/Kconfig61
1 files changed, 32 insertions, 29 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 47264a76eeb..9b26976fb08 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -3,29 +3,43 @@ if ARCH_MSM
choice
prompt "Qualcomm MSM SoC Type"
default ARCH_MSM7X00A
+ depends on ARCH_MSM
config ARCH_MSM7X00A
bool "MSM7x00A / MSM7x01A"
select ARCH_MSM_ARM11
+ select CPU_V6
+ select GPIO_MSM_V1
+ select MACH_TROUT if !MACH_HALIBUT
+ select MSM_PROC_COMM
select MSM_SMD
+ select CLKSRC_QCOM
select MSM_SMD_PKG3
- select CPU_V6
config ARCH_MSM7X30
bool "MSM7x30"
select ARCH_MSM_SCORPION
+ select CPU_V7
+ select GPIO_MSM_V1
+ select MACH_MSM7X30_SURF # if !
+ select MSM_GPIOMUX
+ select MSM_PROC_COMM
select MSM_SMD
+ select CLKSRC_QCOM
select MSM_VIC
- select CPU_V7
- select MSM_REMOTE_SPINLOCK_DEKKERS
config ARCH_QSD8X50
bool "QSD8X50"
select ARCH_MSM_SCORPION
+ select CPU_V7
+ select GPIO_MSM_V1
+ select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5
+ select MSM_GPIOMUX
+ select MSM_PROC_COMM
select MSM_SMD
+ select CLKSRC_QCOM
select MSM_VIC
- select CPU_V7
- select MSM_REMOTE_SPINLOCK_LDREX
+
endchoice
config MSM_SOC_REV_A
@@ -33,6 +47,7 @@ config MSM_SOC_REV_A
config ARCH_MSM_ARM11
bool
+
config ARCH_MSM_SCORPION
bool
@@ -40,6 +55,7 @@ config MSM_VIC
bool
menu "Qualcomm MSM Board Type"
+ depends on ARCH_MSM
config MACH_HALIBUT
depends on ARCH_MSM
@@ -69,41 +85,28 @@ config MACH_QSD8X50_SURF
config MACH_QSD8X50A_ST1_5
depends on ARCH_QSD8X50
- select MSM_SOC_REV_A
bool "QSD8x50A ST1.5"
+ select MSM_SOC_REV_A
help
Support for the Qualcomm ST1.5.
endmenu
-config MSM_DEBUG_UART
- int
- default 1 if MSM_DEBUG_UART1
- default 2 if MSM_DEBUG_UART2
- default 3 if MSM_DEBUG_UART3
-
-choice
- prompt "Debug UART"
-
- default MSM_DEBUG_UART_NONE
-
- config MSM_DEBUG_UART_NONE
- bool "None"
-
- config MSM_DEBUG_UART1
- bool "UART1"
+config MSM_SMD_PKG3
+ bool
- config MSM_DEBUG_UART2
- bool "UART2"
+config MSM_PROC_COMM
+ bool
- config MSM_DEBUG_UART3
- bool "UART3"
-endchoice
+config MSM_SMD
+ bool
-config MSM_SMD_PKG3
+config MSM_GPIOMUX
bool
+ help
+ Support for MSM V1 TLMM GPIOMUX architecture.
-config MSM_SMD
+config MSM_SCM
bool
endif