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

Commit 0cfec946 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 WG timer value to fix cnp failure"

parents e03146e3 d4fed9fb

sound/soc/codecs/msm8x16-wcd.c

+6 −0
Original line number Diff line number Diff line
@@ -3244,6 +3244,9 @@ static int msm8x16_wcd_codec_enable_ear_pa(struct snd_soc_dapm_widget *w, 
			__func__);

		snd_soc_update_bits(codec, MSM8X16_WCD_A_ANALOG_RX_EAR_CTL,

			    0x80, 0x80);

		if (get_codec_version(msm8x16_wcd) < CONGA)

			snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_RX_HPH_CNP_WG_TIME, 0xFF, 0x2A);

		break;

	case SND_SOC_DAPM_POST_PMU:

		dev_dbg(w->codec->dev,
@@ -3274,6 +3277,9 @@ static int msm8x16_wcd_codec_enable_ear_pa(struct snd_soc_dapm_widget *w, 
		 */

		snd_soc_update_bits(codec, MSM8X16_WCD_A_ANALOG_RX_EAR_CTL,

			    0x80, 0x00);

		if (get_codec_version(msm8x16_wcd) < CONGA)

			snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_RX_HPH_CNP_WG_TIME, 0xFF, 0x16);

		break;

	}

	return 0;