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

Commit e96e3871 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: codecs: wcd938x: bypass filter while enabling PA"

parents e84db582 c760477c

asoc/codecs/wcd938x/wcd938x.c

+22 −0
Original line number Diff line number Diff line
@@ -721,6 +721,11 @@ static int wcd938x_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, 
			     WCD_CLSH_STATE_HPHR,

			     hph_mode);

		wcd_clsh_set_hph_mode(component, CLS_H_HIFI);

		if (hph_mode == CLS_H_LP || hph_mode == CLS_H_LOHIFI ||

		    hph_mode == CLS_H_ULP) {

			snd_soc_component_update_bits(component,

				WCD938X_HPH_REFBUFF_LP_CTL, 0x01, 0x01);

		}

		snd_soc_component_update_bits(component, WCD938X_ANA_HPH,

					      0x10, 0x10);

		wcd_clsh_set_hph_mode(component, hph_mode);
@@ -741,6 +746,12 @@ static int wcd938x_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, 
				usleep_range(20000, 20100);

			else

				usleep_range(7000, 7100);

			if (hph_mode == CLS_H_LP ||

			    hph_mode == CLS_H_LOHIFI ||

			    hph_mode == CLS_H_ULP)

				snd_soc_component_update_bits(component,

					WCD938X_HPH_REFBUFF_LP_CTL, 0x01,

					0x00);

			clear_bit(HPH_PA_DELAY, &wcd938x->status_mask);

		}

		snd_soc_component_update_bits(component,
@@ -846,6 +857,11 @@ static int wcd938x_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, 
			     WCD_CLSH_STATE_HPHL,

			     hph_mode);

		wcd_clsh_set_hph_mode(component, CLS_H_HIFI);

		if (hph_mode == CLS_H_LP || hph_mode == CLS_H_LOHIFI ||

		    hph_mode == CLS_H_ULP) {

			snd_soc_component_update_bits(component,

				WCD938X_HPH_REFBUFF_LP_CTL, 0x01, 0x01);

		}

		snd_soc_component_update_bits(component, WCD938X_ANA_HPH,

						0x20, 0x20);

		wcd_clsh_set_hph_mode(component, hph_mode);
@@ -866,6 +882,12 @@ static int wcd938x_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, 
				usleep_range(20000, 20100);

			else

				usleep_range(7000, 7100);

			if (hph_mode == CLS_H_LP ||

			    hph_mode == CLS_H_LOHIFI ||

			    hph_mode == CLS_H_ULP)

				snd_soc_component_update_bits(component,

					WCD938X_HPH_REFBUFF_LP_CTL,

					0x01, 0x00);

			clear_bit(HPH_PA_DELAY, &wcd938x->status_mask);

		}

		snd_soc_component_update_bits(component,