From 6884f421e3913afc6dae16889cb2c90ea37a08d0 Mon Sep 17 00:00:00 2001 From: Ola Lilja Date: Wed, 22 Jun 2011 15:15:03 +0200 Subject: Ux500 ASoC: Fix problem when disabling DMics When DMic1 or DMic2 was disabled the other one was also disabled. This is no longer the case. ST-Ericsson Linux next: NA ST-Ericsson ID: ER348882 ST-Ericsson FOSS-OUT ID: NA Change-Id: I88d402b3f7a22e53424f2f1bcfd6fdc8e8d24468 Signed-off-by: Ola Lilja Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25710 Reviewed-by: QATEST Reviewed-by: Jonas ABERG Reviewed-by: Linus WALLEIJ Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30798 Reviewed-by: Roger NILSSON1 Tested-by: Roger NILSSON1 --- sound/soc/codecs/ab8500_audio.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'sound') diff --git a/sound/soc/codecs/ab8500_audio.c b/sound/soc/codecs/ab8500_audio.c index f52311f9ada..d2de1822b82 100644 --- a/sound/soc/codecs/ab8500_audio.c +++ b/sound/soc/codecs/ab8500_audio.c @@ -694,9 +694,7 @@ static const struct snd_soc_dapm_widget ab8500_dapm_widgets[] = { SND_SOC_DAPM_MIXER("AD1 Channel Gain", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_MIXER("AD2 Channel Gain", SND_SOC_NOPM, 0, 0, NULL, 0), - SND_SOC_DAPM_MIXER("AD1 Enable", REG_ADPATHENA, - REG_ADPATHENA_ENAD12, 0, NULL, 0), - SND_SOC_DAPM_MIXER("AD2 Enable", REG_ADPATHENA, + SND_SOC_DAPM_MIXER("AD12 Enable", REG_ADPATHENA, REG_ADPATHENA_ENAD12, 0, NULL, 0), SND_SOC_DAPM_AIF_OUT("AD_OUT1", "ab8500_0c", 0, SND_SOC_NOPM, 0, 0), @@ -916,11 +914,11 @@ static const struct snd_soc_dapm_route intercon[] = { {"AD1 Channel Gain", NULL, "AD 1 Select Capture Route"}, {"AD2 Channel Gain", NULL, "AD 2 Select Capture Route"}, - {"AD1 Enable", NULL, "AD1 Channel Gain"}, - {"AD2 Enable", NULL, "AD2 Channel Gain"}, + {"AD12 Enable", NULL, "AD1 Channel Gain"}, + {"AD12 Enable", NULL, "AD2 Channel Gain"}, - {"AD_OUT1", NULL, "AD1 Enable"}, - {"AD_OUT2", NULL, "AD2 Enable"}, + {"AD_OUT1", NULL, "AD12 Enable"}, + {"AD_OUT2", NULL, "AD12 Enable"}, /* Microphone 1 path */ @@ -1014,11 +1012,11 @@ static const struct snd_soc_dapm_route intercon[] = { /* Sidetone Filter path */ - {"Sidetone Left Source Playback Route", "LineIn Left", "AD1 Enable"}, - {"Sidetone Left Source Playback Route", "LineIn Right", "AD2 Enable"}, + {"Sidetone Left Source Playback Route", "LineIn Left", "AD12 Enable"}, + {"Sidetone Left Source Playback Route", "LineIn Right", "AD12 Enable"}, {"Sidetone Left Source Playback Route", "Mic 1", "AD3 Enable"}, {"Sidetone Left Source Playback Route", "Headset Left", "DA_IN1"}, - {"Sidetone Right Source Playback Route", "LineIn Right", "AD2 Enable"}, + {"Sidetone Right Source Playback Route", "LineIn Right", "AD12 Enable"}, {"Sidetone Right Source Playback Route", "Mic 1", "AD3 Enable"}, {"Sidetone Right Source Playback Route", "DMic 4", "AD4 Enable"}, {"Sidetone Right Source Playback Route", "Headset Right", "DA_IN2"}, -- cgit v1.2.3