[alsa-devel] ASoC updates for v2.6.29
The following changes since commit 2f42357722f7ddc1ec0236fa55ad49ea8a7ce4b0: Peter Ujfalusi (1): ASoC: TWL4030: Convert the bitfield enums to VALUE_ENUM type
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-tiwai
Mark Brown (2): ASoC: Use snd_soc_dapm_nc_pin() in at91sam9g20ek ASoC: Fix SND_SOC_ALL_CODECS handling of dual SPI and I2C control buses
sound/soc/atmel/sam9g20_wm8731.c | 4 ++-- sound/soc/codecs/Kconfig | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-)
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com --- sound/soc/atmel/sam9g20_wm8731.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index 1fb59a9..6ea04be 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) snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
/* not connected */ - snd_soc_dapm_disable_pin(codec, "RLINEIN"); - snd_soc_dapm_disable_pin(codec, "LLINEIN"); + snd_soc_dapm_nc_pin(codec, "RLINEIN"); + snd_soc_dapm_nc_pin(codec, "LLINEIN");
/* always connected */ snd_soc_dapm_enable_pin(codec, "Int Mic");
For codecs that have both SPI and I2C support we need to ensure that we don't try to make the codec driver built in when I2C is modular since that won't link. Do this by creating a helper variable which uses conditional defaults to pick up the correct value for all combinations.
We don't need to do anything special for I2C-only codecs since a conditional select passes on the full value for a tristate.
Reported-by: Ingo Molnar mingo@elte.hu Tested-by: Ingo Molnar mingo@elte.hu Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com --- sound/soc/codecs/Kconfig | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index c41289b..d0e0d69 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1,3 +1,13 @@ +# Helper to resolve issues with configs that have SPI enabled but I2C +# modular, meaning we can't build the codec driver in with I2C support. +# We use an ordered list of conditional defaults to pick the appropriate +# setting - SPI can't be modular so that case doesn't need to be covered. +config SND_SOC_I2C_AND_SPI + tristate + default m if I2C=m + default y if I2C=y + default y if SPI_MASTER=y + config SND_SOC_ALL_CODECS tristate "Build all ASoC CODEC drivers" select SND_SOC_AC97_CODEC if SND_SOC_AC97_BUS @@ -14,12 +24,12 @@ config SND_SOC_ALL_CODECS select SND_SOC_UDA134X select SND_SOC_UDA1380 if I2C select SND_SOC_WM8350 if MFD_WM8350 - select SND_SOC_WM8510 if (I2C || SPI_MASTER) + select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8580 if I2C - select SND_SOC_WM8728 if (I2C || SPI_MASTER) - select SND_SOC_WM8731 if (I2C || SPI_MASTER) - select SND_SOC_WM8750 if (I2C || SPI_MASTER) - select SND_SOC_WM8753 if (I2C || SPI_MASTER) + select SND_SOC_WM8728 if SND_SOC_I2C_AND_SPI + select SND_SOC_WM8731 if SND_SOC_I2C_AND_SPI + select SND_SOC_WM8750 if SND_SOC_I2C_AND_SPI + select SND_SOC_WM8753 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8900 if I2C select SND_SOC_WM8903 if I2C select SND_SOC_WM8971 if I2C
At Tue, 6 Jan 2009 14:58:37 +0000, Mark Brown wrote:
The following changes since commit 2f42357722f7ddc1ec0236fa55ad49ea8a7ce4b0: Peter Ujfalusi (1): ASoC: TWL4030: Convert the bitfield enums to VALUE_ENUM type
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-tiwai
Thanks, now pulled and included in the pull request.
Takashi
participants (2)
-
Mark Brown -
Takashi Iwai