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

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

Merge "ASoC: wcd9335: don't check for HPHL and HPHR for mono headset"

parents fd985903 eaa7842a

sound/soc/codecs/wcd9335.c

+20 −12
Original line number Diff line number Diff line
@@ -3769,12 +3769,16 @@ static int tasha_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, 
		set_bit(HPH_PA_DELAY, &tasha->status_mask);

		break;

	case SND_SOC_DAPM_POST_PMU:

		if ((snd_soc_read(codec, WCD9335_ANA_HPH) & 0xC0) != 0xC0)

			/* If PA_EN is not set (potentially in ANC case) then

			 * do nothing for POST_PMU and let left channel handle

			 * everything.

		if (!(strcmp(w->name, "ANC HPHR PA"))) {

			if ((snd_soc_read(codec, WCD9335_ANA_HPH) & 0xC0)

							!= 0xC0)

				/*

				 * If PA_EN is not set (potentially in ANC case)

				 * then do nothing for POST_PMU and let left

				 * channel handle everything.

				 */

				break;

		}

		/*

		 * 7ms sleep is required after PA is enabled as per

		 * HW requirement
@@ -3859,12 +3863,16 @@ static int tasha_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, 
		set_bit(HPH_PA_DELAY, &tasha->status_mask);

		break;

	case SND_SOC_DAPM_POST_PMU:

		if ((snd_soc_read(codec, WCD9335_ANA_HPH) & 0xC0) != 0xC0)

			/* If PA_EN is not set (potentially in ANC case) then

			 * do nothing for POST_PMU and let right channel handle

			 * everything.

		if (!(strcmp(w->name, "ANC HPHL PA"))) {

			if ((snd_soc_read(codec, WCD9335_ANA_HPH) & 0xC0)

								!= 0xC0)

				/*

				 * If PA_EN is not set (potentially in ANC case)

				 * then do nothing for POST_PMU and let right

				 * channel handle everything.

				 */

				break;

		}

		/*

		 * 7ms sleep is required after PA is enabled as per

		 * HW requirement