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

Commit f751dc96 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: update registers for IN1 recording"

parents a038ce49 f09f7629

sound/soc/codecs/msm8x16-wcd.c

+7 −1
Original line number Diff line number Diff line
@@ -1855,7 +1855,7 @@ static int msm8x16_wcd_codec_enable_micbias(struct snd_soc_dapm_widget *w, 
	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		if (strnstr(w->name, internal1_text, 30)) {

			snd_soc_update_bits(codec, micb_int_reg, 0x40, 0x40);

			snd_soc_update_bits(codec, micb_int_reg, 0x80, 0x80);

		} else if (strnstr(w->name, internal2_text, 30)) {

			snd_soc_update_bits(codec, micb_int_reg, 0x10, 0x10);

			snd_soc_update_bits(codec, w->reg, 0x20, 0x00);
@@ -1868,6 +1868,12 @@ static int msm8x16_wcd_codec_enable_micbias(struct snd_soc_dapm_widget *w, 
		break;

	case SND_SOC_DAPM_POST_PMU:

		usleep_range(20000, 20100);

		if (strnstr(w->name, internal1_text, 30))

			snd_soc_update_bits(codec, micb_int_reg, 0x40, 0x40);

		else if (strnstr(w->name, internal2_text, 30))

			snd_soc_update_bits(codec, micb_int_reg, 0x08, 0x08);

		else if (strnstr(w->name, internal3_text, 30))

			snd_soc_update_bits(codec, micb_int_reg, 0x01, 0x01);

		break;

	case SND_SOC_DAPM_POST_PMD:

		if (strnstr(w->name, internal1_text, 30)) {