Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97e0002a authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/arizona' into asoc-linus

parents 317ddd25 ee4b7c7f

sound/soc/codecs/wm5102.c

+2 −1
Original line number Diff line number Diff line
@@ -1120,7 +1120,8 @@ SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 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),

		       ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0,

		       &wm5102_aec_loopback_mux),



SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,

		   ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

sound/soc/codecs/wm5110.c

+2 −1
Original line number Diff line number Diff line
@@ -503,7 +503,8 @@ SND_SOC_DAPM_PGA("ASRC2R", ARIZONA_ASRC_ENABLE, ARIZONA_ASRC2R_ENA_SHIFT, 0, 
		 NULL, 0),



SND_SOC_DAPM_VALUE_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,

		       ARIZONA_AEC_LOOPBACK_ENA, 0, &wm5110_aec_loopback_mux),

		       ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0,

		       &wm5110_aec_loopback_mux),



SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0),