From: Dimitris Papastamos Date: Tue, 20 Nov 2012 13:15:21 +0000 (+0000) Subject: ASoC: wm5102: Register DSP1 Aux widgets X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4cbc365509560086faca950d69bd89fc956033b3;p=linux-beck.git ASoC: wm5102: Register DSP1 Aux widgets It seems WM_ADSP2("DSP1", 0) is added twice to the widgets list, remove that and in place use ARIZONA_DSP_WIDGETS(DSP1, "DSP1"). We need to make sure that the DSP1 Aux widgets are provided otherwise we'll see errors such as "Failed to add route DSP1 Aux 1 -> DSP1" etc. Signed-off-by: Dimitris Papastamos Signed-off-by: Mark Brown --- diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index b81251f2ecf0..b18fd2ea1874 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -992,7 +992,7 @@ SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0, SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0, ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX2_ENA_SHIFT, 0), -WM_ADSP2("DSP1", 0), +ARIZONA_DSP_WIDGETS(DSP1, "DSP1"), SND_SOC_DAPM_VALUE_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1, ARIZONA_AEC_LOOPBACK_ENA, 0, &wm5102_aec_loopback_mux),