ASoC: sgtl5000: Initialize CHIP_ANA_POWER to power-on defaults

[deliverable/linux.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 03242a4dc5a864b9cd0ea56a6ef4d74ce29c65c8..4d82a58ff6b0b9c43c9f6f892ecbd6ab79e44de8 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -43,6 +43,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_AK5386
        select SND_SOC_ALC5623 if I2C
        select SND_SOC_ALC5632 if I2C
+       select SND_SOC_BT_SCO
        select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
        select SND_SOC_CS35L32 if I2C
        select SND_SOC_CS42L51_I2C if I2C
@@ -64,7 +65,6 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_DA732X if I2C
        select SND_SOC_DA9055 if I2C
        select SND_SOC_DMIC
-       select SND_SOC_BT_SCO
        select SND_SOC_ES8328_SPI if SPI_MASTER
        select SND_SOC_ES8328_I2C if I2C
        select SND_SOC_GTM601
@@ -370,6 +370,9 @@ config SND_SOC_ALC5623
 config SND_SOC_ALC5632
        tristate
 
+config SND_SOC_BT_SCO
+       tristate
+
 config SND_SOC_CQ0093VC
        tristate
 
@@ -476,9 +479,6 @@ config SND_SOC_DA732X
 config SND_SOC_DA9055
        tristate
 
-config SND_SOC_BT_SCO
-       tristate
-
 config SND_SOC_DMIC
        tristate
 
@@ -943,7 +943,8 @@ config SND_SOC_WM8955
        tristate
 
 config SND_SOC_WM8960
-       tristate
+       tristate "Wolfson Microelectronics WM8960 CODEC"
+       depends on I2C
 
 config SND_SOC_WM8961
        tristate