Merge "ASoC: sdm660_cdc: Fix pop after PDR on SDM670 internal codec" (44747bc5) · Commits · e / devices / android_kernel_fairphone_FP3

asoc/codecs/sdm660_cdc/msm-analog-cdc.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -3762,12 +3762,11 @@ static int msm_anlg_cdc_device_down(struct snd_soc_codec *codec)
		}
		msm_anlg_cdc_boost_off(codec);
		sdm660_cdc_priv->hph_mode = NORMAL_MODE;

		/* 40ms to allow boost to discharge */
		msleep(40);
		/* Disable PA to avoid pop during codec bring up */
		snd_soc_update_bits(codec, MSM89XX_PMIC_ANALOG_RX_HPH_CNP_EN,
		0x30, 0x00);
		/* 40ms to allow boost to discharge */
		msleep(40);
		snd_soc_update_bits(codec, MSM89XX_PMIC_ANALOG_SPKR_DRV_CTL,
		0x80, 0x00);
		snd_soc_write(codec,