Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 76a6106f124e375df0ea6ba6bcf204b8caff786a

Authored by Jarkko Nikula
Committed by Mark Brown
1 parent 703dde6219
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ASoC: Include cx20442 to SND_SOC_ALL_CODECS 

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Showing 1 changed file with 1 additions and 0 deletions Inline Diff

sound/soc/codecs/Kconfig
Diff comments   View file @ 76a6106
1 # Helper to resolve issues with configs that have SPI enabled but I2C 1 # Helper to resolve issues with configs that have SPI enabled but I2C
2 # modular, meaning we can't build the codec driver in with I2C support. 2 # modular, meaning we can't build the codec driver in with I2C support.
3 # We use an ordered list of conditional defaults to pick the appropriate 3 # We use an ordered list of conditional defaults to pick the appropriate
4 # setting - SPI can't be modular so that case doesn't need to be covered. 4 # setting - SPI can't be modular so that case doesn't need to be covered.
5 config SND_SOC_I2C_AND_SPI 5 config SND_SOC_I2C_AND_SPI
6 tristate 6 tristate
7 default m if I2C=m 7 default m if I2C=m
8 default y if I2C=y 8 default y if I2C=y
9 default y if SPI_MASTER=y 9 default y if SPI_MASTER=y
10 10
11 config SND_SOC_ALL_CODECS 11 config SND_SOC_ALL_CODECS
12 tristate "Build all ASoC CODEC drivers" 12 tristate "Build all ASoC CODEC drivers"
13 select SND_SOC_88PM860X if MFD_88PM860X 13 select SND_SOC_88PM860X if MFD_88PM860X
14 select SND_SOC_L3 14 select SND_SOC_L3
15 select SND_SOC_AC97_CODEC if SND_SOC_AC97_BUS 15 select SND_SOC_AC97_CODEC if SND_SOC_AC97_BUS
16 select SND_SOC_AD1836 if SPI_MASTER 16 select SND_SOC_AD1836 if SPI_MASTER
17 select SND_SOC_AD193X if SND_SOC_I2C_AND_SPI 17 select SND_SOC_AD193X if SND_SOC_I2C_AND_SPI
18 select SND_SOC_AD1980 if SND_SOC_AC97_BUS 18 select SND_SOC_AD1980 if SND_SOC_AC97_BUS
19 select SND_SOC_ADS117X 19 select SND_SOC_ADS117X
20 select SND_SOC_AD73311 if I2C 20 select SND_SOC_AD73311 if I2C
21 select SND_SOC_AK4104 if SPI_MASTER 21 select SND_SOC_AK4104 if SPI_MASTER
22 select SND_SOC_AK4535 if I2C 22 select SND_SOC_AK4535 if I2C
23 select SND_SOC_AK4642 if I2C 23 select SND_SOC_AK4642 if I2C
24 select SND_SOC_AK4671 if I2C 24 select SND_SOC_AK4671 if I2C
25 select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC 25 select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
26 select SND_SOC_CS42L51 if I2C 26 select SND_SOC_CS42L51 if I2C
27 select SND_SOC_CS4270 if I2C 27 select SND_SOC_CS4270 if I2C
28 select SND_SOC_CX20442
28 select SND_SOC_DA7210 if I2C 29 select SND_SOC_DA7210 if I2C
29 select SND_SOC_JZ4740_CODEC if SOC_JZ4740 30 select SND_SOC_JZ4740_CODEC if SOC_JZ4740
30 select SND_SOC_MAX98088 if I2C 31 select SND_SOC_MAX98088 if I2C
31 select SND_SOC_MAX9877 if I2C 32 select SND_SOC_MAX9877 if I2C
32 select SND_SOC_PCM3008 33 select SND_SOC_PCM3008
33 select SND_SOC_SPDIF 34 select SND_SOC_SPDIF
34 select SND_SOC_SSM2602 if I2C 35 select SND_SOC_SSM2602 if I2C
35 select SND_SOC_STAC9766 if SND_SOC_AC97_BUS 36 select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
36 select SND_SOC_TLV320AIC23 if I2C 37 select SND_SOC_TLV320AIC23 if I2C
37 select SND_SOC_TLV320AIC26 if SPI_MASTER 38 select SND_SOC_TLV320AIC26 if SPI_MASTER
38 select SND_SOC_TLV320AIC3X if I2C 39 select SND_SOC_TLV320AIC3X if I2C
39 select SND_SOC_TPA6130A2 if I2C 40 select SND_SOC_TPA6130A2 if I2C
40 select SND_SOC_TLV320DAC33 if I2C 41 select SND_SOC_TLV320DAC33 if I2C
41 select SND_SOC_TWL4030 if TWL4030_CORE 42 select SND_SOC_TWL4030 if TWL4030_CORE
42 select SND_SOC_TWL6040 if TWL4030_CORE 43 select SND_SOC_TWL6040 if TWL4030_CORE
43 select SND_SOC_UDA134X 44 select SND_SOC_UDA134X
44 select SND_SOC_UDA1380 if I2C 45 select SND_SOC_UDA1380 if I2C
45 select SND_SOC_WL1273 if WL1273_CORE 46 select SND_SOC_WL1273 if WL1273_CORE
46 select SND_SOC_WM2000 if I2C 47 select SND_SOC_WM2000 if I2C
47 select SND_SOC_WM8350 if MFD_WM8350 48 select SND_SOC_WM8350 if MFD_WM8350
48 select SND_SOC_WM8400 if MFD_WM8400 49 select SND_SOC_WM8400 if MFD_WM8400
49 select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI 50 select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI
50 select SND_SOC_WM8523 if I2C 51 select SND_SOC_WM8523 if I2C
51 select SND_SOC_WM8580 if I2C 52 select SND_SOC_WM8580 if I2C
52 select SND_SOC_WM8711 if SND_SOC_I2C_AND_SPI 53 select SND_SOC_WM8711 if SND_SOC_I2C_AND_SPI
53 select SND_SOC_WM8727 54 select SND_SOC_WM8727
54 select SND_SOC_WM8728 if SND_SOC_I2C_AND_SPI 55 select SND_SOC_WM8728 if SND_SOC_I2C_AND_SPI
55 select SND_SOC_WM8731 if SND_SOC_I2C_AND_SPI 56 select SND_SOC_WM8731 if SND_SOC_I2C_AND_SPI
56 select SND_SOC_WM8741 if SND_SOC_I2C_AND_SPI 57 select SND_SOC_WM8741 if SND_SOC_I2C_AND_SPI
57 select SND_SOC_WM8750 if SND_SOC_I2C_AND_SPI 58 select SND_SOC_WM8750 if SND_SOC_I2C_AND_SPI
58 select SND_SOC_WM8753 if SND_SOC_I2C_AND_SPI 59 select SND_SOC_WM8753 if SND_SOC_I2C_AND_SPI
59 select SND_SOC_WM8776 if SND_SOC_I2C_AND_SPI 60 select SND_SOC_WM8776 if SND_SOC_I2C_AND_SPI
60 select SND_SOC_WM8804 if SND_SOC_I2C_AND_SPI 61 select SND_SOC_WM8804 if SND_SOC_I2C_AND_SPI
61 select SND_SOC_WM8900 if I2C 62 select SND_SOC_WM8900 if I2C
62 select SND_SOC_WM8903 if I2C 63 select SND_SOC_WM8903 if I2C
63 select SND_SOC_WM8904 if I2C 64 select SND_SOC_WM8904 if I2C
64 select SND_SOC_WM8940 if I2C 65 select SND_SOC_WM8940 if I2C
65 select SND_SOC_WM8955 if I2C 66 select SND_SOC_WM8955 if I2C
66 select SND_SOC_WM8960 if I2C 67 select SND_SOC_WM8960 if I2C
67 select SND_SOC_WM8961 if I2C 68 select SND_SOC_WM8961 if I2C
68 select SND_SOC_WM8962 if I2C 69 select SND_SOC_WM8962 if I2C
69 select SND_SOC_WM8971 if I2C 70 select SND_SOC_WM8971 if I2C
70 select SND_SOC_WM8974 if I2C 71 select SND_SOC_WM8974 if I2C
71 select SND_SOC_WM8978 if I2C 72 select SND_SOC_WM8978 if I2C
72 select SND_SOC_WM8985 if SND_SOC_I2C_AND_SPI 73 select SND_SOC_WM8985 if SND_SOC_I2C_AND_SPI
73 select SND_SOC_WM8988 if SND_SOC_I2C_AND_SPI 74 select SND_SOC_WM8988 if SND_SOC_I2C_AND_SPI
74 select SND_SOC_WM8990 if I2C 75 select SND_SOC_WM8990 if I2C
75 select SND_SOC_WM8993 if I2C 76 select SND_SOC_WM8993 if I2C
76 select SND_SOC_WM8994 if MFD_WM8994 77 select SND_SOC_WM8994 if MFD_WM8994
77 select SND_SOC_WM9081 if I2C 78 select SND_SOC_WM9081 if I2C
78 select SND_SOC_WM9090 if I2C 79 select SND_SOC_WM9090 if I2C
79 select SND_SOC_WM9705 if SND_SOC_AC97_BUS 80 select SND_SOC_WM9705 if SND_SOC_AC97_BUS
80 select SND_SOC_WM9712 if SND_SOC_AC97_BUS 81 select SND_SOC_WM9712 if SND_SOC_AC97_BUS
81 select SND_SOC_WM9713 if SND_SOC_AC97_BUS 82 select SND_SOC_WM9713 if SND_SOC_AC97_BUS
82 help 83 help
83 Normally ASoC codec drivers are only built if a machine driver which 84 Normally ASoC codec drivers are only built if a machine driver which
84 uses them is also built since they are only usable with a machine 85 uses them is also built since they are only usable with a machine
85 driver. Selecting this option will allow these drivers to be built 86 driver. Selecting this option will allow these drivers to be built
86 without an explicit machine driver for test and development purposes. 87 without an explicit machine driver for test and development purposes.
87 88
88 Support for the bus types used to access the codecs to be built must 89 Support for the bus types used to access the codecs to be built must
89 be selected separately. 90 be selected separately.
90 91
91 If unsure select "N". 92 If unsure select "N".
92 93
93 config SND_SOC_88PM860X 94 config SND_SOC_88PM860X
94 tristate 95 tristate
95 96
96 config SND_SOC_WM_HUBS 97 config SND_SOC_WM_HUBS
97 tristate 98 tristate
98 default y if SND_SOC_WM8993=y || SND_SOC_WM8994=y 99 default y if SND_SOC_WM8993=y || SND_SOC_WM8994=y
99 default m if SND_SOC_WM8993=m || SND_SOC_WM8994=m 100 default m if SND_SOC_WM8993=m || SND_SOC_WM8994=m
100 101
101 config SND_SOC_AC97_CODEC 102 config SND_SOC_AC97_CODEC
102 tristate 103 tristate
103 select SND_AC97_CODEC 104 select SND_AC97_CODEC
104 105
105 config SND_SOC_AD1836 106 config SND_SOC_AD1836
106 tristate 107 tristate
107 108
108 config SND_SOC_AD193X 109 config SND_SOC_AD193X
109 tristate 110 tristate
110 111
111 config SND_SOC_AD1980 112 config SND_SOC_AD1980
112 tristate 113 tristate
113 114
114 config SND_SOC_AD73311 115 config SND_SOC_AD73311
115 tristate 116 tristate
116 117
117 config SND_SOC_ADS117X 118 config SND_SOC_ADS117X
118 tristate 119 tristate
119 120
120 config SND_SOC_AK4104 121 config SND_SOC_AK4104
121 tristate 122 tristate
122 123
123 config SND_SOC_AK4535 124 config SND_SOC_AK4535
124 tristate 125 tristate
125 126
126 config SND_SOC_AK4642 127 config SND_SOC_AK4642
127 tristate 128 tristate
128 129
129 config SND_SOC_AK4671 130 config SND_SOC_AK4671
130 tristate 131 tristate
131 132
132 config SND_SOC_CQ0093VC 133 config SND_SOC_CQ0093VC
133 tristate 134 tristate
134 135
135 config SND_SOC_CS42L51 136 config SND_SOC_CS42L51
136 tristate 137 tristate
137 138
138 # Cirrus Logic CS4270 Codec 139 # Cirrus Logic CS4270 Codec
139 config SND_SOC_CS4270 140 config SND_SOC_CS4270
140 tristate 141 tristate
141 142
142 # Cirrus Logic CS4270 Codec VD = 3.3V Errata 143 # Cirrus Logic CS4270 Codec VD = 3.3V Errata
143 # Select if you are affected by the errata where the part will not function 144 # Select if you are affected by the errata where the part will not function
144 # if MCLK divide-by-1.5 is selected and VD is set to 3.3V. The driver will 145 # if MCLK divide-by-1.5 is selected and VD is set to 3.3V. The driver will
145 # not select any sample rates that require MCLK to be divided by 1.5. 146 # not select any sample rates that require MCLK to be divided by 1.5.
146 config SND_SOC_CS4270_VD33_ERRATA 147 config SND_SOC_CS4270_VD33_ERRATA
147 bool 148 bool
148 depends on SND_SOC_CS4270 149 depends on SND_SOC_CS4270
149 150
150 config SND_SOC_CX20442 151 config SND_SOC_CX20442
151 tristate 152 tristate
152 153
153 config SND_SOC_JZ4740_CODEC 154 config SND_SOC_JZ4740_CODEC
154 tristate 155 tristate
155 156
156 config SND_SOC_L3 157 config SND_SOC_L3
157 tristate 158 tristate
158 159
159 config SND_SOC_DA7210 160 config SND_SOC_DA7210
160 tristate 161 tristate
161 162
162 config SND_SOC_MAX98088 163 config SND_SOC_MAX98088
163 tristate 164 tristate
164 165
165 config SND_SOC_PCM3008 166 config SND_SOC_PCM3008
166 tristate 167 tristate
167 168
168 config SND_SOC_SPDIF 169 config SND_SOC_SPDIF
169 tristate 170 tristate
170 171
171 config SND_SOC_SSM2602 172 config SND_SOC_SSM2602
172 tristate 173 tristate
173 174
174 config SND_SOC_STAC9766 175 config SND_SOC_STAC9766
175 tristate 176 tristate
176 177
177 config SND_SOC_TLV320AIC23 178 config SND_SOC_TLV320AIC23
178 tristate 179 tristate
179 180
180 config SND_SOC_TLV320AIC26 181 config SND_SOC_TLV320AIC26
181 tristate "TI TLV320AIC26 Codec support" if SND_SOC_OF_SIMPLE 182 tristate "TI TLV320AIC26 Codec support" if SND_SOC_OF_SIMPLE
182 depends on SPI 183 depends on SPI
183 184
184 config SND_SOC_TLV320AIC3X 185 config SND_SOC_TLV320AIC3X
185 tristate 186 tristate
186 187
187 config SND_SOC_TLV320DAC33 188 config SND_SOC_TLV320DAC33
188 tristate 189 tristate
189 190
190 config SND_SOC_TWL4030 191 config SND_SOC_TWL4030
191 select TWL4030_CODEC 192 select TWL4030_CODEC
192 tristate 193 tristate
193 194
194 config SND_SOC_TWL6040 195 config SND_SOC_TWL6040
195 tristate 196 tristate
196 197
197 config SND_SOC_UDA134X 198 config SND_SOC_UDA134X
198 tristate 199 tristate
199 200
200 config SND_SOC_UDA1380 201 config SND_SOC_UDA1380
201 tristate 202 tristate
202 203
203 config SND_SOC_WL1273 204 config SND_SOC_WL1273
204 tristate 205 tristate
205 206
206 config SND_SOC_WM8350 207 config SND_SOC_WM8350
207 tristate 208 tristate
208 209
209 config SND_SOC_WM8400 210 config SND_SOC_WM8400
210 tristate 211 tristate
211 212
212 config SND_SOC_WM8510 213 config SND_SOC_WM8510
213 tristate 214 tristate
214 215
215 config SND_SOC_WM8523 216 config SND_SOC_WM8523
216 tristate 217 tristate
217 218
218 config SND_SOC_WM8580 219 config SND_SOC_WM8580
219 tristate 220 tristate
220 221
221 config SND_SOC_WM8711 222 config SND_SOC_WM8711
222 tristate 223 tristate
223 224
224 config SND_SOC_WM8727 225 config SND_SOC_WM8727
225 tristate 226 tristate
226 227
227 config SND_SOC_WM8728 228 config SND_SOC_WM8728
228 tristate 229 tristate
229 230
230 config SND_SOC_WM8731 231 config SND_SOC_WM8731
231 tristate 232 tristate
232 233
233 config SND_SOC_WM8741 234 config SND_SOC_WM8741
234 tristate 235 tristate
235 236
236 config SND_SOC_WM8750 237 config SND_SOC_WM8750
237 tristate 238 tristate
238 239
239 config SND_SOC_WM8753 240 config SND_SOC_WM8753
240 tristate 241 tristate
241 242
242 config SND_SOC_WM8776 243 config SND_SOC_WM8776
243 tristate 244 tristate
244 245
245 config SND_SOC_WM8804 246 config SND_SOC_WM8804
246 tristate 247 tristate
247 248
248 config SND_SOC_WM8900 249 config SND_SOC_WM8900
249 tristate 250 tristate
250 251
251 config SND_SOC_WM8903 252 config SND_SOC_WM8903
252 tristate 253 tristate
253 254
254 config SND_SOC_WM8904 255 config SND_SOC_WM8904
255 tristate 256 tristate
256 257
257 config SND_SOC_WM8940 258 config SND_SOC_WM8940
258 tristate 259 tristate
259 260
260 config SND_SOC_WM8955 261 config SND_SOC_WM8955
261 tristate 262 tristate
262 263
263 config SND_SOC_WM8960 264 config SND_SOC_WM8960
264 tristate 265 tristate
265 266
266 config SND_SOC_WM8961 267 config SND_SOC_WM8961
267 tristate 268 tristate
268 269
269 config SND_SOC_WM8962 270 config SND_SOC_WM8962
270 tristate 271 tristate
271 272
272 config SND_SOC_WM8971 273 config SND_SOC_WM8971
273 tristate 274 tristate
274 275
275 config SND_SOC_WM8974 276 config SND_SOC_WM8974
276 tristate 277 tristate
277 278
278 config SND_SOC_WM8978 279 config SND_SOC_WM8978
279 tristate 280 tristate
280 281
281 config SND_SOC_WM8985 282 config SND_SOC_WM8985
282 tristate 283 tristate
283 284
284 config SND_SOC_WM8988 285 config SND_SOC_WM8988
285 tristate 286 tristate
286 287
287 config SND_SOC_WM8990 288 config SND_SOC_WM8990
288 tristate 289 tristate
289 290
290 config SND_SOC_WM8993 291 config SND_SOC_WM8993
291 tristate 292 tristate
292 293
293 config SND_SOC_WM8994 294 config SND_SOC_WM8994
294 tristate 295 tristate
295 296
296 config SND_SOC_WM9081 297 config SND_SOC_WM9081
297 tristate 298 tristate
298 299
299 config SND_SOC_WM9705 300 config SND_SOC_WM9705
300 tristate 301 tristate
301 302
302 config SND_SOC_WM9712 303 config SND_SOC_WM9712
303 tristate 304 tristate
304 305
305 config SND_SOC_WM9713 306 config SND_SOC_WM9713
306 tristate 307 tristate
307 308
308 # Amp 309 # Amp
309 config SND_SOC_MAX9877 310 config SND_SOC_MAX9877
310 tristate 311 tristate
311 312
312 config SND_SOC_TPA6130A2 313 config SND_SOC_TPA6130A2
313 tristate 314 tristate
314 315
315 config SND_SOC_WM2000 316 config SND_SOC_WM2000
316 tristate 317 tristate
317 318
318 config SND_SOC_WM9090 319 config SND_SOC_WM9090
319 tristate 320 tristate
320 321