diff options
Diffstat (limited to 'arch/arm/mach-msm/Kconfig')
-rw-r--r-- | arch/arm/mach-msm/Kconfig | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 7902de151cc5..b61908594b47 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig | |||
@@ -10,35 +10,35 @@ choice | |||
10 | 10 | ||
11 | config ARCH_MSM7X00A | 11 | config ARCH_MSM7X00A |
12 | bool "MSM7x00A / MSM7x01A" | 12 | bool "MSM7x00A / MSM7x01A" |
13 | select MACH_TROUT if !MACH_HALIBUT | ||
14 | select ARCH_MSM_ARM11 | 13 | select ARCH_MSM_ARM11 |
15 | select MSM_SMD | ||
16 | select MSM_SMD_PKG3 | ||
17 | select CPU_V6 | 14 | select CPU_V6 |
18 | select GPIO_MSM_V1 | 15 | select GPIO_MSM_V1 |
16 | select MACH_TROUT if !MACH_HALIBUT | ||
19 | select MSM_PROC_COMM | 17 | select MSM_PROC_COMM |
18 | select MSM_SMD | ||
19 | select MSM_SMD_PKG3 | ||
20 | 20 | ||
21 | config ARCH_MSM7X30 | 21 | config ARCH_MSM7X30 |
22 | bool "MSM7x30" | 22 | bool "MSM7x30" |
23 | select MACH_MSM7X30_SURF # if ! | ||
24 | select ARCH_MSM_SCORPION | 23 | select ARCH_MSM_SCORPION |
25 | select MSM_SMD | ||
26 | select MSM_VIC | ||
27 | select CPU_V7 | 24 | select CPU_V7 |
28 | select MSM_GPIOMUX | ||
29 | select GPIO_MSM_V1 | 25 | select GPIO_MSM_V1 |
26 | select MACH_MSM7X30_SURF # if ! | ||
27 | select MSM_GPIOMUX | ||
30 | select MSM_PROC_COMM | 28 | select MSM_PROC_COMM |
29 | select MSM_SMD | ||
30 | select MSM_VIC | ||
31 | 31 | ||
32 | config ARCH_QSD8X50 | 32 | config ARCH_QSD8X50 |
33 | bool "QSD8X50" | 33 | bool "QSD8X50" |
34 | select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5 | ||
35 | select ARCH_MSM_SCORPION | 34 | select ARCH_MSM_SCORPION |
36 | select MSM_SMD | ||
37 | select MSM_VIC | ||
38 | select CPU_V7 | 35 | select CPU_V7 |
39 | select MSM_GPIOMUX | ||
40 | select GPIO_MSM_V1 | 36 | select GPIO_MSM_V1 |
37 | select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5 | ||
38 | select MSM_GPIOMUX | ||
41 | select MSM_PROC_COMM | 39 | select MSM_PROC_COMM |
40 | select MSM_SMD | ||
41 | select MSM_VIC | ||
42 | 42 | ||
43 | endchoice | 43 | endchoice |
44 | 44 | ||
@@ -47,10 +47,10 @@ config ARCH_MSM8X60 | |||
47 | select ARCH_MSM_SCORPIONMP | 47 | select ARCH_MSM_SCORPIONMP |
48 | select ARM_GIC | 48 | select ARM_GIC |
49 | select CPU_V7 | 49 | select CPU_V7 |
50 | select MSM_V2_TLMM | ||
51 | select GPIO_MSM_V2 | 50 | select GPIO_MSM_V2 |
52 | select MSM_GPIOMUX | 51 | select MSM_GPIOMUX |
53 | select MSM_SCM if SMP | 52 | select MSM_SCM if SMP |
53 | select MSM_V2_TLMM | ||
54 | select USE_OF | 54 | select USE_OF |
55 | 55 | ||
56 | config ARCH_MSM8960 | 56 | config ARCH_MSM8960 |
@@ -58,9 +58,9 @@ config ARCH_MSM8960 | |||
58 | select ARCH_MSM_SCORPIONMP | 58 | select ARCH_MSM_SCORPIONMP |
59 | select ARM_GIC | 59 | select ARM_GIC |
60 | select CPU_V7 | 60 | select CPU_V7 |
61 | select MSM_V2_TLMM | ||
62 | select MSM_GPIOMUX | 61 | select MSM_GPIOMUX |
63 | select MSM_SCM if SMP | 62 | select MSM_SCM if SMP |
63 | select MSM_V2_TLMM | ||
64 | select USE_OF | 64 | select USE_OF |
65 | 65 | ||
66 | config MSM_HAS_DEBUG_UART_HS | 66 | config MSM_HAS_DEBUG_UART_HS |
@@ -110,8 +110,8 @@ config MACH_QSD8X50_SURF | |||
110 | 110 | ||
111 | config MACH_QSD8X50A_ST1_5 | 111 | config MACH_QSD8X50A_ST1_5 |
112 | depends on ARCH_QSD8X50 | 112 | depends on ARCH_QSD8X50 |
113 | select MSM_SOC_REV_A | ||
114 | bool "QSD8x50A ST1.5" | 113 | bool "QSD8x50A ST1.5" |
114 | select MSM_SOC_REV_A | ||
115 | help | 115 | help |
116 | Support for the Qualcomm ST1.5. | 116 | Support for the Qualcomm ST1.5. |
117 | 117 | ||