summaryrefslogtreecommitdiff
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorJohan Bohlin <johan.bohlin@stericsson.com>2011-08-26 15:10:21 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:04:56 +0200
commit575b5cbc76dab75daabc198ff6777595fed354c8 (patch)
treecdf7b3a2231b6ed781be8e4ffb6be681dece4e2f /sound/soc/codecs
parentc1ef9515febd2728205849f5bc9c558bc94227af (diff)
Ux500 ASoC: Remove analog loopback graph from DAPM
ST-Ericsson ID: 358 510 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I134d32150292a0616ddc764c51b20d8f1120dbbe Signed-off-by: Johan Bohlin <johan.bohlin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29557 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30803 Tested-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/ab8500_audio.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/sound/soc/codecs/ab8500_audio.c b/sound/soc/codecs/ab8500_audio.c
index 6d8a8213366..1a4db42e333 100644
--- a/sound/soc/codecs/ab8500_audio.c
+++ b/sound/soc/codecs/ab8500_audio.c
@@ -879,11 +879,6 @@ static const struct snd_soc_dapm_widget ab8500_dapm_widgets[] = {
SND_SOC_DAPM_MIXER("LINL to HSL Gain", SND_SOC_NOPM, 0, 0, NULL, 0),
SND_SOC_DAPM_MIXER("LINR to HSR Gain", SND_SOC_NOPM, 0, 0, NULL, 0),
- /* Analog Loopback path */
-
- SND_SOC_DAPM_MIXER("AD1 to IHFL Gain", SND_SOC_NOPM, 0, 0, NULL, 0),
- SND_SOC_DAPM_MIXER("AD2 to IHFR Gain", SND_SOC_NOPM, 0, 0, NULL, 0),
-
/* Acoustical Noise Cancellation path */
SND_SOC_DAPM_MUX("ANC Source Playback Route",
@@ -1083,14 +1078,6 @@ static const struct snd_soc_dapm_route intercon[] = {
{"HSL DAC Driver", NULL, "LINL to HSL Gain"},
{"HSR DAC Driver", NULL, "LINR to HSR Gain"},
- /* Analog Loopback path */
-
- {"AD1 to IHFL Gain", NULL, "AD1 Channel Gain"},
- {"AD2 to IHFR Gain", NULL, "AD2 Channel Gain"},
-
- {"IHFL DAC", NULL, "AD1 to IHFL Gain"},
- {"IHFR DAC", NULL, "AD2 to IHFR Gain"},
-
/* Acoustical Noise Cancellation path */
{"ANC Source Playback Route", "Mic 2 / DMic 5", "AD5 Channel Gain"},