diff options
Diffstat (limited to 'arch/arm/mach-msm/Kconfig')
-rw-r--r-- | arch/arm/mach-msm/Kconfig | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 1516896e8d1..ebde97f5d5f 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig | |||
@@ -11,6 +11,7 @@ config ARCH_MSM7X00A | |||
11 | select MSM_SMD | 11 | select MSM_SMD |
12 | select MSM_SMD_PKG3 | 12 | select MSM_SMD_PKG3 |
13 | select CPU_V6 | 13 | select CPU_V6 |
14 | select GPIO_MSM_V1 | ||
14 | select MSM_PROC_COMM | 15 | select MSM_PROC_COMM |
15 | select HAS_MSM_DEBUG_UART_PHYS | 16 | select HAS_MSM_DEBUG_UART_PHYS |
16 | 17 | ||
@@ -22,6 +23,7 @@ config ARCH_MSM7X30 | |||
22 | select MSM_VIC | 23 | select MSM_VIC |
23 | select CPU_V7 | 24 | select CPU_V7 |
24 | select MSM_GPIOMUX | 25 | select MSM_GPIOMUX |
26 | select GPIO_MSM_V1 | ||
25 | select MSM_PROC_COMM | 27 | select MSM_PROC_COMM |
26 | select HAS_MSM_DEBUG_UART_PHYS | 28 | select HAS_MSM_DEBUG_UART_PHYS |
27 | 29 | ||
@@ -33,6 +35,7 @@ config ARCH_QSD8X50 | |||
33 | select MSM_VIC | 35 | select MSM_VIC |
34 | select CPU_V7 | 36 | select CPU_V7 |
35 | select MSM_GPIOMUX | 37 | select MSM_GPIOMUX |
38 | select GPIO_MSM_V1 | ||
36 | select MSM_PROC_COMM | 39 | select MSM_PROC_COMM |
37 | select HAS_MSM_DEBUG_UART_PHYS | 40 | select HAS_MSM_DEBUG_UART_PHYS |
38 | 41 | ||
@@ -44,6 +47,7 @@ config ARCH_MSM8X60 | |||
44 | select ARM_GIC | 47 | select ARM_GIC |
45 | select CPU_V7 | 48 | select CPU_V7 |
46 | select MSM_V2_TLMM | 49 | select MSM_V2_TLMM |
50 | select GPIO_MSM_V2 | ||
47 | select MSM_GPIOMUX | 51 | select MSM_GPIOMUX |
48 | select MSM_SCM if SMP | 52 | select MSM_SCM if SMP |
49 | 53 | ||
@@ -148,22 +152,6 @@ config MACH_MSM8960_RUMI3 | |||
148 | 152 | ||
149 | endmenu | 153 | endmenu |
150 | 154 | ||
151 | config MSM_IOMMU | ||
152 | bool "MSM IOMMU Support" | ||
153 | depends on ARCH_MSM8X60 || ARCH_MSM8960 | ||
154 | select IOMMU_API | ||
155 | default n | ||
156 | help | ||
157 | Support for the IOMMUs found on certain Qualcomm SOCs. | ||
158 | These IOMMUs allow virtualization of the address space used by most | ||
159 | cores within the multimedia subsystem. | ||
160 | |||
161 | If unsure, say N here. | ||
162 | |||
163 | config IOMMU_PGTABLES_L2 | ||
164 | def_bool y | ||
165 | depends on MSM_IOMMU && MMU && SMP && CPU_DCACHE_DISABLE=n | ||
166 | |||
167 | config MSM_DEBUG_UART | 155 | config MSM_DEBUG_UART |
168 | int | 156 | int |
169 | default 1 if MSM_DEBUG_UART1 | 157 | default 1 if MSM_DEBUG_UART1 |
@@ -205,9 +193,6 @@ config MSM_GPIOMUX | |||
205 | config MSM_V2_TLMM | 193 | config MSM_V2_TLMM |
206 | bool | 194 | bool |
207 | 195 | ||
208 | config IOMMU_API | ||
209 | bool | ||
210 | |||
211 | config MSM_SCM | 196 | config MSM_SCM |
212 | bool | 197 | bool |
213 | endif | 198 | endif |