diff options
| author | Ola Lilja <ola.o.lilja@stericsson.com> | 2011-06-22 15:15:03 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 16:07:32 +0200 |
| commit | 3f6c0720bd6b853030a7e876a07c6846904e4412 (patch) | |
| tree | 852ed4b29806de86bd2d3719d33a1463bb8d5cc7 /sound | |
| parent | f715f6ed91e659a291eaaff7f1f32ebb8685ee0f (diff) | |
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 <ola.o.lilja@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25710
Reviewed-by: QATEST
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30798
Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
Tested-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/ab8500_audio.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sound/soc/codecs/ab8500_audio.c b/sound/soc/codecs/ab8500_audio.c index a8883ea4f0b..d1aefda773a 100644 --- a/sound/soc/codecs/ab8500_audio.c +++ b/sound/soc/codecs/ab8500_audio.c @@ -691,9 +691,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), @@ -913,11 +911,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 */ @@ -1011,11 +1009,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"}, |