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

Commit 8aa75cc2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm8x16-wcd: fix headset tx record issue"

parents e6b5f071 3521be7b

sound/soc/codecs/msm8x16-wcd.c

+3 −3
Original line number Diff line number Diff line
@@ -1229,7 +1229,7 @@ static const char * const iir1_inp1_text[] = { 
};



static const struct soc_enum adc2_enum =

	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(adc2_mux_text), adc2_mux_text);

	SOC_ENUM_SINGLE(0, 0, ARRAY_SIZE(adc2_mux_text), adc2_mux_text);



/* RX1 MIX1 */

static const struct soc_enum rx_mix1_inp1_chain_enum =
@@ -1331,7 +1331,7 @@ static const struct snd_kcontrol_new rx2_mix2_inp1_mux = 
	SOC_DAPM_ENUM("RX2 MIX2 INP1 Mux", rx2_mix2_inp1_chain_enum);



static const struct snd_kcontrol_new tx_adc2_mux =

	SOC_DAPM_ENUM("ADC2 MUX Mux", adc2_enum);

	SOC_DAPM_ENUM_VIRT("ADC2 MUX Mux", adc2_enum);



static int msm8x16_wcd_put_dec_enum(struct snd_kcontrol *kcontrol,

			      struct snd_ctl_elem_value *ucontrol)
@@ -2797,7 +2797,7 @@ static const struct snd_soc_dapm_widget msm8x16_wcd_dapm_widgets[] = { 
	SND_SOC_DAPM_MIXER("ADC2", SND_SOC_NOPM, 0, 0, NULL, 0),

	SND_SOC_DAPM_MIXER("ADC3", SND_SOC_NOPM, 0, 0, NULL, 0),



	SND_SOC_DAPM_MUX("ADC2 MUX", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_VIRT_MUX("ADC2 MUX", SND_SOC_NOPM, 0, 0,

		&tx_adc2_mux),



	SND_SOC_DAPM_MICBIAS("MIC BIAS External",