Merge "ASoC: msm8x16: enable ocp for ear path" (0e21fa50) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/codecs/msm8x16-wcd.c

+12 −1

Original line number	Diff line number	Diff line
		@@ -4895,9 +4895,14 @@ static int msm8x16_wcd_codec_enable_ear_pa(struct snd_soc_dapm_widget *w,
		if (get_codec_version(msm8x16_wcd) < CONGA)
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_ANALOG_RX_HPH_CNP_WG_TIME, 0xFF, 0x2A);
		if (get_codec_version(msm8x16_wcd) >= DIANGU)
		if (get_codec_version(msm8x16_wcd) >= DIANGU) {
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_ANALOG_RX_COM_BIAS_DAC, 0x08, 0x00);
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_ANALOG_RX_HPH_L_TEST, 0x04, 0x04);
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_ANALOG_RX_HPH_R_TEST, 0x04, 0x04);
		}
		break;
		case SND_SOC_DAPM_POST_PMU:
		dev_dbg(w->codec->dev,
		@@ -4920,6 +4925,12 @@ static int msm8x16_wcd_codec_enable_ear_pa(struct snd_soc_dapm_widget *w,
		__func__, msm8x16_wcd->boost_option);
		msm8x16_wcd_boost_mode_sequence(codec, EAR_PMD);
		}
		if (get_codec_version(msm8x16_wcd) >= DIANGU) {
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_ANALOG_RX_HPH_L_TEST, 0x04, 0x0);
		snd_soc_update_bits(codec,
		MSM8X16_WCD_A_ANALOG_RX_HPH_R_TEST, 0x04, 0x0);
		}
		break;
		case SND_SOC_DAPM_POST_PMD:
		dev_dbg(w->codec->dev,