aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-05-02 02:25:25 -0400
committerTakashi Iwai <tiwai@suse.de>2017-05-02 02:25:25 -0400
commita5c3b32a1146e44f6b38fdfdfffc27842953420c (patch)
treeeca93f51c8deabe77ed079a3e9190717b6380009 /sound/soc/codecs/Kconfig
parentd7dc450d5a7162de96edbed6b1792240c2f3a55f (diff)
parent20d5c84bef067b7e804a163e2abca16c47125bad (diff)
Merge tag 'asoc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.12 A quiet release for the core, but lots of new drivers this time around: - A new, generalized, API for hooking up jacks which makes it easier to write generic machine drivers for simple cases. - Continuing fixes for issues with the x86 CPU drivers. - New drivers for Cirrus CS35L35, DIO DIO2125, Everest ES7132, HiSilicon hi6210, Maxim MAX98927, MT2701 systems with WM8960, Nuvoton NAU8824, Odroid systems, ST STM32 SAI controllers and x86 systems with DA7213
Diffstat (limited to 'sound/soc/codecs/Kconfig')
-rw-r--r--sound/soc/codecs/Kconfig30
1 files changed, 28 insertions, 2 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index e49e9da7f1f6..883ed4c8a551 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -49,6 +49,7 @@ config SND_SOC_ALL_CODECS
49 select SND_SOC_CS35L32 if I2C 49 select SND_SOC_CS35L32 if I2C
50 select SND_SOC_CS35L33 if I2C 50 select SND_SOC_CS35L33 if I2C
51 select SND_SOC_CS35L34 if I2C 51 select SND_SOC_CS35L34 if I2C
52 select SND_SOC_CS35L35 if I2C
52 select SND_SOC_CS42L42 if I2C 53 select SND_SOC_CS42L42 if I2C
53 select SND_SOC_CS42L51_I2C if I2C 54 select SND_SOC_CS42L51_I2C if I2C
54 select SND_SOC_CS42L52 if I2C && INPUT 55 select SND_SOC_CS42L52 if I2C && INPUT
@@ -69,9 +70,11 @@ config SND_SOC_ALL_CODECS
69 select SND_SOC_DA7219 if I2C 70 select SND_SOC_DA7219 if I2C
70 select SND_SOC_DA732X if I2C 71 select SND_SOC_DA732X if I2C
71 select SND_SOC_DA9055 if I2C 72 select SND_SOC_DA9055 if I2C
73 select SND_SOC_DIO2125
72 select SND_SOC_DMIC 74 select SND_SOC_DMIC
73 select SND_SOC_ES8328_SPI if SPI_MASTER 75 select SND_SOC_ES8328_SPI if SPI_MASTER
74 select SND_SOC_ES8328_I2C if I2C 76 select SND_SOC_ES8328_I2C if I2C
77 select SND_SOC_ES7134
75 select SND_SOC_GTM601 78 select SND_SOC_GTM601
76 select SND_SOC_HDAC_HDMI 79 select SND_SOC_HDAC_HDMI
77 select SND_SOC_ICS43432 80 select SND_SOC_ICS43432
@@ -89,6 +92,7 @@ config SND_SOC_ALL_CODECS
89 select SND_SOC_MAX9867 if I2C 92 select SND_SOC_MAX9867 if I2C
90 select SND_SOC_MAX98925 if I2C 93 select SND_SOC_MAX98925 if I2C
91 select SND_SOC_MAX98926 if I2C 94 select SND_SOC_MAX98926 if I2C
95 select SND_SOC_MAX98927 if I2C
92 select SND_SOC_MAX9850 if I2C 96 select SND_SOC_MAX9850 if I2C
93 select SND_SOC_MAX9860 if I2C 97 select SND_SOC_MAX9860 if I2C
94 select SND_SOC_MAX9768 if I2C 98 select SND_SOC_MAX9768 if I2C
@@ -97,6 +101,7 @@ config SND_SOC_ALL_CODECS
97 select SND_SOC_ML26124 if I2C 101 select SND_SOC_ML26124 if I2C
98 select SND_SOC_NAU8540 if I2C 102 select SND_SOC_NAU8540 if I2C
99 select SND_SOC_NAU8810 if I2C 103 select SND_SOC_NAU8810 if I2C
104 select SND_SOC_NAU8824 if I2C
100 select SND_SOC_NAU8825 if I2C 105 select SND_SOC_NAU8825 if I2C
101 select SND_SOC_HDMI_CODEC 106 select SND_SOC_HDMI_CODEC
102 select SND_SOC_PCM1681 if I2C 107 select SND_SOC_PCM1681 if I2C
@@ -303,12 +308,14 @@ config SND_SOC_ADAU1761
303 select SND_SOC_ADAU17X1 308 select SND_SOC_ADAU17X1
304 309
305config SND_SOC_ADAU1761_I2C 310config SND_SOC_ADAU1761_I2C
306 tristate 311 tristate "Analog Devices AU1761 CODEC - I2C"
312 depends on I2C
307 select SND_SOC_ADAU1761 313 select SND_SOC_ADAU1761
308 select REGMAP_I2C 314 select REGMAP_I2C
309 315
310config SND_SOC_ADAU1761_SPI 316config SND_SOC_ADAU1761_SPI
311 tristate 317 tristate "Analog Devices AU1761 CODEC - SPI"
318 depends on SPI
312 select SND_SOC_ADAU1761 319 select SND_SOC_ADAU1761
313 select REGMAP_SPI 320 select REGMAP_SPI
314 321
@@ -408,6 +415,10 @@ config SND_SOC_CS35L34
408 tristate "Cirrus Logic CS35L34 CODEC" 415 tristate "Cirrus Logic CS35L34 CODEC"
409 depends on I2C 416 depends on I2C
410 417
418config SND_SOC_CS35L35
419 tristate "Cirrus Logic CS35L35 CODEC"
420 depends on I2C
421
411config SND_SOC_CS42L42 422config SND_SOC_CS42L42
412 tristate "Cirrus Logic CS42L42 CODEC" 423 tristate "Cirrus Logic CS42L42 CODEC"
413 depends on I2C 424 depends on I2C
@@ -516,6 +527,10 @@ config SND_SOC_DA732X
516config SND_SOC_DA9055 527config SND_SOC_DA9055
517 tristate 528 tristate
518 529
530config SND_SOC_DIO2125
531 tristate "Dioo DIO2125 Amplifier"
532 select GPIOLIB
533
519config SND_SOC_DMIC 534config SND_SOC_DMIC
520 tristate 535 tristate
521 536
@@ -525,6 +540,9 @@ config SND_SOC_HDMI_CODEC
525 select SND_PCM_IEC958 540 select SND_PCM_IEC958
526 select HDMI 541 select HDMI
527 542
543config SND_SOC_ES7134
544 tristate "Everest Semi ES7134 CODEC"
545
528config SND_SOC_ES8328 546config SND_SOC_ES8328
529 tristate 547 tristate
530 548
@@ -588,6 +606,10 @@ config SND_SOC_MAX98925
588config SND_SOC_MAX98926 606config SND_SOC_MAX98926
589 tristate 607 tristate
590 608
609config SND_SOC_MAX98927
610 tristate "Maxim Integrated MAX98927 Speaker Amplifier"
611 depends on I2C
612
591config SND_SOC_MAX9850 613config SND_SOC_MAX9850
592 tristate 614 tristate
593 615
@@ -1116,6 +1138,10 @@ config SND_SOC_NAU8810
1116 tristate "Nuvoton Technology Corporation NAU88C10 CODEC" 1138 tristate "Nuvoton Technology Corporation NAU88C10 CODEC"
1117 depends on I2C 1139 depends on I2C
1118 1140
1141config SND_SOC_NAU8824
1142 tristate "Nuvoton Technology Corporation NAU88L24 CODEC"
1143 depends on I2C
1144
1119config SND_SOC_NAU8825 1145config SND_SOC_NAU8825
1120 tristate 1146 tristate
1121 1147