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

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

Merge "ASoC: wcd938x: Do not enable hold_off while enabling watchdog"

parents 6fb66eda b00df5a5

asoc/codecs/wcd938x/wcd938x.c

+10 −10
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ static int wcd938x_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, 
		usleep_range(100, 110);

		set_bit(HPH_PA_DELAY, &wcd938x->status_mask);

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_PDM_WD_CTL1, 0x17, 0x13);

				WCD938X_DIGITAL_PDM_WD_CTL1, 0x07, 0x03);

		break;

	case SND_SOC_DAPM_POST_PMU:

		/*
@@ -885,7 +885,7 @@ static int wcd938x_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, 
		snd_soc_component_update_bits(component, WCD938X_ANA_HPH,

						0x10, 0x00);

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_PDM_WD_CTL1, 0x17, 0x00);

				WCD938X_DIGITAL_PDM_WD_CTL1, 0x07, 0x00);

		wcd_cls_h_fsm(component, &wcd938x->clsh_info,

			     WCD_CLSH_EVENT_POST_PA,

			     WCD_CLSH_STATE_HPHR,
@@ -941,7 +941,7 @@ static int wcd938x_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, 
		usleep_range(100, 110);

		set_bit(HPH_PA_DELAY, &wcd938x->status_mask);

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_PDM_WD_CTL0, 0x17, 0x13);

				WCD938X_DIGITAL_PDM_WD_CTL0, 0x07, 0x03);

		break;

	case SND_SOC_DAPM_POST_PMU:

		/*
@@ -1021,7 +1021,7 @@ static int wcd938x_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, 
		snd_soc_component_update_bits(component, WCD938X_ANA_HPH,

						0x20, 0x00);

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_PDM_WD_CTL0, 0x17, 0x00);

				WCD938X_DIGITAL_PDM_WD_CTL0, 0x07, 0x00);

		wcd_cls_h_fsm(component, &wcd938x->clsh_info,

			     WCD_CLSH_EVENT_POST_PA,

			     WCD_CLSH_STATE_HPHL,
@@ -1054,7 +1054,7 @@ static int wcd938x_codec_enable_aux_pa(struct snd_soc_dapm_widget *w, 
			    wcd938x->rx_swr_dev->dev_num,

			    true);

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_PDM_WD_CTL2, 0x05, 0x05);

				WCD938X_DIGITAL_PDM_WD_CTL2, 0x01, 0x01);

		break;

	case SND_SOC_DAPM_POST_PMU:

		/* 1 msec delay as per HW requirement */
@@ -1082,7 +1082,7 @@ static int wcd938x_codec_enable_aux_pa(struct snd_soc_dapm_widget *w, 
		/* 1 msec delay as per HW requirement */

		usleep_range(1000, 1010);

		snd_soc_component_update_bits(component,

				WCD938X_DIGITAL_PDM_WD_CTL2, 0x05, 0x00);

				WCD938X_DIGITAL_PDM_WD_CTL2, 0x01, 0x00);

		wcd_cls_h_fsm(component, &wcd938x->clsh_info,

			     WCD_CLSH_EVENT_POST_PA,

			     WCD_CLSH_STATE_AUX,
@@ -1126,11 +1126,11 @@ static int wcd938x_codec_enable_ear_pa(struct snd_soc_dapm_widget *w, 
		if (wcd938x->ear_rx_path & EAR_RX_PATH_AUX)

			snd_soc_component_update_bits(component,

					WCD938X_DIGITAL_PDM_WD_CTL2,

					0x05, 0x05);

					0x01, 0x01);

		else

			snd_soc_component_update_bits(component,

					WCD938X_DIGITAL_PDM_WD_CTL0,

					0x17, 0x13);

					0x07, 0x03);

		if (!wcd938x->comp1_enable)

			snd_soc_component_update_bits(component,

				WCD938X_ANA_EAR_COMPANDER_CTL, 0x80, 0x80);
@@ -1185,11 +1185,11 @@ static int wcd938x_codec_enable_ear_pa(struct snd_soc_dapm_widget *w, 
		if (wcd938x->ear_rx_path & EAR_RX_PATH_AUX)

			snd_soc_component_update_bits(component,

					WCD938X_DIGITAL_PDM_WD_CTL2,

					0x05, 0x00);

					0x01, 0x00);

		else

			snd_soc_component_update_bits(component,

					WCD938X_DIGITAL_PDM_WD_CTL0,

					0x17, 0x00);

					0x07, 0x00);

		wcd_cls_h_fsm(component, &wcd938x->clsh_info,

			     WCD_CLSH_EVENT_POST_PA,

			     WCD_CLSH_STATE_EAR,