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

Commit a795ea30 authored by Aravind Kumar's avatar Aravind Kumar
Browse files

ASoC: msm8x16-wcd: support boost enable by default 



The current code cannot support ear boost in bypass
mode and speaker boost enabled by default.
The change ensures that the register writes for
ear boost in bypass mode and speaker boost are present
only in the ear path and speaker path respectively

Change-Id: Icf5a78ffb7ecd2354aba3904faf2180647780048
Signed-off-by: default avatarAravind Kumar <akumark@codeaurora.org>
parent c77ae18c

sound/soc/codecs/msm8x16-wcd.c

+44 −46
Original line number Diff line number Diff line
@@ -696,25 +696,60 @@ static int msm8x16_wcd_codec_enable_charge_pump(struct snd_soc_dapm_widget *w, 
	dev_dbg(codec->dev, "%s: event = %d\n", __func__, event);

	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		if (!(strcmp(w->name, "EAR CP")))

		if (!(strcmp(w->name, "EAR CP"))) {

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_DIGITAL_CDC_DIG_CLK_CTL,

					0x80, 0x80);

		else

			if (msm8x16_wcd->ear_pa_boost_set) {

				snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_SEC_ACCESS,

					0xA5, 0xA5);

				snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_PERPH_RESET_CTL3,

					0x07, 0x07);

				snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BYPASS_MODE,

					0x40, 0x40);

				snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BYPASS_MODE,

					0x80, 0x80);

				snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BYPASS_MODE,

					0x02, 0x02);

				snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BOOST_EN_CTL,

					0xDF, 0xDF);

			}

		} else {

				snd_soc_update_bits(codec,

					MSM8X16_WCD_A_DIGITAL_CDC_DIG_CLK_CTL,

					0xC0, 0xC0);

		}

		break;

	case SND_SOC_DAPM_POST_PMU:

		usleep_range(CODEC_DELAY_1_MS, CODEC_DELAY_1_1_MS);

		break;

	case SND_SOC_DAPM_POST_PMD:

		usleep_range(CODEC_DELAY_1_MS, CODEC_DELAY_1_1_MS);

		if (!(strcmp(w->name, "EAR CP")))

		if (!(strcmp(w->name, "EAR CP"))) {

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_DIGITAL_CDC_DIG_CLK_CTL,

					0x80, 0x00);

		else {

			if (msm8x16_wcd->ear_pa_boost_set) {

				snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BOOST_EN_CTL,

					0x80, 0x00);

				snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BYPASS_MODE,

					0x80, 0x00);

				snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BYPASS_MODE,

					0x02, 0x00);

				snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BYPASS_MODE,

					0x40, 0x00);

			}

		} else {

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_DIGITAL_CDC_DIG_CLK_CTL,

					0x40, 0x00);
@@ -1641,7 +1676,6 @@ static int msm8x16_wcd_codec_enable_dig_clk(struct snd_soc_dapm_widget *w, 
			event, w->name);

	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		if (w->shift == 2)

		snd_soc_update_bits(codec, w->reg, 0x80, 0x80);

		if (msm8x16_wcd->spk_boost_set) {

			snd_soc_update_bits(codec,
@@ -1663,28 +1697,6 @@ static int msm8x16_wcd_codec_enable_dig_clk(struct snd_soc_dapm_widget *w, 
			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_CURRENT_LIMIT,

					0x83, 0x83);

		} else if (msm8x16_wcd->ear_pa_boost_set) {

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_SEC_ACCESS,

					0xA5, 0xA5);

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_PERPH_RESET_CTL3,

					0x07, 0x07);

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BYPASS_MODE,

					0x40, 0x40);

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BYPASS_MODE,

					0x80, 0x80);

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BYPASS_MODE,

					0x02, 0x02);

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BOOST_EN_CTL,

					0xDF, 0xDF);

		} else {

			snd_soc_update_bits(codec, w->reg, 1<<w->shift,

					1<<w->shift);

		}

		break;

	case SND_SOC_DAPM_POST_PMD:
@@ -1695,21 +1707,6 @@ static int msm8x16_wcd_codec_enable_dig_clk(struct snd_soc_dapm_widget *w, 
			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_DIGITAL_CDC_DIG_CLK_CTL,

					0x20, 0x00);

		} else if (msm8x16_wcd->ear_pa_boost_set) {

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BOOST_EN_CTL,

					0x80, 0x00);

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BYPASS_MODE,

					0x80, 0x00);

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BYPASS_MODE,

					0x02, 0x00);

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BYPASS_MODE,

					0x40, 0x00);

		} else {

			snd_soc_update_bits(codec, w->reg, 1<<w->shift, 0x00);

		}

		break;

	}
@@ -2820,10 +2817,10 @@ static const struct snd_soc_dapm_widget msm8x16_wcd_dapm_widgets[] = { 
		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),



	SND_SOC_DAPM_SUPPLY("RX1 CLK", MSM8X16_WCD_A_DIGITAL_CDC_DIG_CLK_CTL,

		0, 0, msm8x16_wcd_codec_enable_dig_clk, SND_SOC_DAPM_PRE_PMU |

		0, 0, NULL, SND_SOC_DAPM_PRE_PMU |

		SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_SUPPLY("RX2 CLK", MSM8X16_WCD_A_DIGITAL_CDC_DIG_CLK_CTL,

		1, 0, msm8x16_wcd_codec_enable_dig_clk, SND_SOC_DAPM_PRE_PMU |

		1, 0, NULL, SND_SOC_DAPM_PRE_PMU |

		SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_SUPPLY("RX3 CLK", MSM8X16_WCD_A_DIGITAL_CDC_DIG_CLK_CTL,

		2, 0, msm8x16_wcd_codec_enable_dig_clk, SND_SOC_DAPM_PRE_PMU |
@@ -2991,6 +2988,7 @@ static const struct msm8x16_wcd_reg_mask_val msm8x16_wcd_reg_defaults_2_0[] = { 
	MSM8X16_WCD_REG_VAL(MSM8X16_WCD_A_ANALOG_SPKR_DRV_DBG, 0x01),

	MSM8X16_WCD_REG_VAL(MSM8X16_WCD_A_ANALOG_BOOST_EN_CTL, 0x5F),

	MSM8X16_WCD_REG_VAL(MSM8X16_WCD_A_ANALOG_SLOPE_COMP_IP_ZERO, 0x88),

	MSM8X16_WCD_REG_VAL(MSM8X16_WCD_A_ANALOG_SEC_ACCESS, 0xA5),

	MSM8X16_WCD_REG_VAL(MSM8X16_WCD_A_ANALOG_PERPH_RESET_CTL3, 0x0F),

	MSM8X16_WCD_REG_VAL(MSM8X16_WCD_A_ANALOG_CURRENT_LIMIT, 0x82),

	MSM8X16_WCD_REG_VAL(MSM8X16_WCD_A_ANALOG_SPKR_DAC_CTL, 0x03),