From 575b5cbc76dab75daabc198ff6777595fed354c8 Mon Sep 17 00:00:00 2001 From: Johan Bohlin Date: Fri, 26 Aug 2011 15:10:21 +0200 Subject: 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 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29557 Reviewed-by: Roger NILSSON1 Reviewed-by: Jonas ABERG Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30803 Tested-by: Roger NILSSON1 --- sound/soc/codecs/ab8500_audio.c | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'sound/soc') 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"}, -- cgit v1.2.3