aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-01-06 10:33:52 -0500
committerTakashi Iwai <tiwai@suse.de>2009-01-06 10:33:52 -0500
commit167968199089435c63ad1140ccfb8c6179274a0a (patch)
tree3022b75b0e76f6561364ad5d76f3bb28d1e85c1d /sound
parent5439e726b54af8fdd958afa2ff42c4821eaf027a (diff)
parent227b4dc6432d271eecd0ff0aefe6f0897ec47397 (diff)
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/atmel/sam9g20_wm8731.c4
-rw-r--r--sound/soc/codecs/Kconfig20
2 files changed, 17 insertions, 7 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index 1fb59a9d3719..6ea04be911d0 100644
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -221,8 +221,8 @@ static int at91sam9g20ek_wm8731_init(struct snd_soc_codec *codec)
221 snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon)); 221 snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
222 222
223 /* not connected */ 223 /* not connected */
224 snd_soc_dapm_disable_pin(codec, "RLINEIN"); 224 snd_soc_dapm_nc_pin(codec, "RLINEIN");
225 snd_soc_dapm_disable_pin(codec, "LLINEIN"); 225 snd_soc_dapm_nc_pin(codec, "LLINEIN");
226 226
227 /* always connected */ 227 /* always connected */
228 snd_soc_dapm_enable_pin(codec, "Int Mic"); 228 snd_soc_dapm_enable_pin(codec, "Int Mic");
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index c41289b5f586..d0e0d691ae51 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -1,3 +1,13 @@
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.
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.
5config SND_SOC_I2C_AND_SPI
6 tristate
7 default m if I2C=m
8 default y if I2C=y
9 default y if SPI_MASTER=y
10
1config SND_SOC_ALL_CODECS 11config SND_SOC_ALL_CODECS
2 tristate "Build all ASoC CODEC drivers" 12 tristate "Build all ASoC CODEC drivers"
3 select SND_SOC_AC97_CODEC if SND_SOC_AC97_BUS 13 select SND_SOC_AC97_CODEC if SND_SOC_AC97_BUS
@@ -14,12 +24,12 @@ config SND_SOC_ALL_CODECS
14 select SND_SOC_UDA134X 24 select SND_SOC_UDA134X
15 select SND_SOC_UDA1380 if I2C 25 select SND_SOC_UDA1380 if I2C
16 select SND_SOC_WM8350 if MFD_WM8350 26 select SND_SOC_WM8350 if MFD_WM8350
17 select SND_SOC_WM8510 if (I2C || SPI_MASTER) 27 select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI
18 select SND_SOC_WM8580 if I2C 28 select SND_SOC_WM8580 if I2C
19 select SND_SOC_WM8728 if (I2C || SPI_MASTER) 29 select SND_SOC_WM8728 if SND_SOC_I2C_AND_SPI
20 select SND_SOC_WM8731 if (I2C || SPI_MASTER) 30 select SND_SOC_WM8731 if SND_SOC_I2C_AND_SPI
21 select SND_SOC_WM8750 if (I2C || SPI_MASTER) 31 select SND_SOC_WM8750 if SND_SOC_I2C_AND_SPI
22 select SND_SOC_WM8753 if (I2C || SPI_MASTER) 32 select SND_SOC_WM8753 if SND_SOC_I2C_AND_SPI
23 select SND_SOC_WM8900 if I2C 33 select SND_SOC_WM8900 if I2C
24 select SND_SOC_WM8903 if I2C 34 select SND_SOC_WM8903 if I2C
25 select SND_SOC_WM8971 if I2C 35 select SND_SOC_WM8971 if I2C