Merge remote-tracking branch 'asoc/topic/intel' into asoc-next

[sfrench/cifs-2.6.git] / sound / soc / codecs / rt5670.c

diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c
index d90c74ef5c4271d6b49c94090e8069a8209a991a..a5f15a104c47a7558405380f8603490e7bd9b921 100644 (file)
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
@@ -1717,7 +1717,6 @@ static const struct snd_soc_dapm_widget rt5670_dapm_widgets[] = {
        SND_SOC_DAPM_PGA("IF1_ADC1", SND_SOC_NOPM, 0, 0, NULL, 0),
        SND_SOC_DAPM_PGA("IF1_ADC2", SND_SOC_NOPM, 0, 0, NULL, 0),
        SND_SOC_DAPM_PGA("IF1_ADC3", SND_SOC_NOPM, 0, 0, NULL, 0),
-       SND_SOC_DAPM_PGA("IF1_ADC4", SND_SOC_NOPM, 0, 0, NULL, 0),
 
        /* DSP */
        SND_SOC_DAPM_PGA("TxDP_ADC", SND_SOC_NOPM, 0, 0, NULL, 0),
@@ -2086,13 +2085,13 @@ static const struct snd_soc_dapm_route rt5670_dapm_routes[] = {
        { "IF1 ADC1 IN1 Mux", "IF1_ADC3", "IF1_ADC3" },
 
        { "IF1 ADC1 IN2 Mux", "IF1_ADC1_IN1", "IF1 ADC1 IN1 Mux" },
-       { "IF1 ADC1 IN2 Mux", "IF1_ADC4", "IF1_ADC4" },
+       { "IF1 ADC1 IN2 Mux", "IF1_ADC4", "TxDP_ADC" },
 
        { "IF1 ADC2 IN Mux", "IF_ADC2", "IF_ADC2" },
        { "IF1 ADC2 IN Mux", "VAD_ADC", "VAD_ADC" },
 
        { "IF1 ADC2 IN1 Mux", "IF1_ADC2_IN", "IF1 ADC2 IN Mux" },
-       { "IF1 ADC2 IN1 Mux", "IF1_ADC4", "IF1_ADC4" },
+       { "IF1 ADC2 IN1 Mux", "IF1_ADC4", "TxDP_ADC" },
 
        { "IF1_ADC1" , NULL, "IF1 ADC1 IN2 Mux" },
        { "IF1_ADC2" , NULL, "IF1 ADC2 IN1 Mux" },