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

Commit d2dc72d7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm8x16-wcd: update speaker path tear down sequence"

parents edcac95d 5b425052

sound/soc/codecs/msm8x16-wcd.c

+23 −18
Original line number Diff line number Diff line
@@ -1915,25 +1915,41 @@ static int msm8x16_wcd_codec_enable_spk_pa(struct snd_soc_dapm_widget *w, 
	case SND_SOC_DAPM_PRE_PMD:

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_CDC_RX3_B6_CTL, 0x01, 0x01);

		msleep(20);

		msm8x16_wcd->mute_mask |= SPKR_PA_DISABLE;

		/*

		 * Add sleep for 1 ms for mute to take effect

		 */

		usleep_range(CODEC_DELAY_1_MS, CODEC_DELAY_1_1_MS);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_SPKR_DAC_CTL, 0x10, 0x10);

		if (msm8x16_wcd->spk_boost_set) {

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BOOST_EN_CTL,

					0xDF, 0x5F);

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_DIGITAL_CDC_DIG_CLK_CTL,

					0x20, 0x00);

		}

		/*

		 * Add 20 ms sleep for the boost to settle down

		 */

		msleep(20);

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

		if (msm8x16_wcd->spk_boost_set)

			snd_soc_update_bits(codec,

				MSM8X16_WCD_A_ANALOG_SPKR_DRV_CTL, 0xEF, 0x69);

		else

			snd_soc_update_bits(codec,

				MSM8X16_WCD_A_ANALOG_SPKR_DAC_CTL, 0x10, 0x00);

		break;

	case SND_SOC_DAPM_POST_PMD:

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_SPKR_PWRSTG_CTL, 0xE0, 0x00);

		if (get_codec_version(msm8x16_wcd) != TOMBAK_1_0)

			snd_soc_update_bits(codec,

				MSM8X16_WCD_A_ANALOG_RX_EAR_CTL, 0x01, 0x00);

		usleep_range(CODEC_DELAY_1_MS, CODEC_DELAY_1_1_MS);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_SPKR_PWRSTG_CTL, 0x01, 0x00);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_ANALOG_SPKR_DAC_CTL, 0x10, 0x00);

		if (get_codec_version(msm8x16_wcd) != TOMBAK_1_0)

			snd_soc_update_bits(codec,

				MSM8X16_WCD_A_ANALOG_RX_EAR_CTL, 0x01, 0x00);

		snd_soc_update_bits(codec,

			MSM8X16_WCD_A_DIGITAL_CDC_ANA_CLK_CTL, 0x10, 0x00);

		break;
@@ -2011,9 +2027,6 @@ static int msm8x16_wcd_codec_enable_dig_clk(struct snd_soc_dapm_widget *w, 
					MSM8X16_WCD_A_ANALOG_BOOST_EN_CTL,

					0xDF, 0xDF);

			usleep_range(CODEC_DELAY_1_MS, CODEC_DELAY_1_1_MS);

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_CURRENT_LIMIT,

					0x83, 0x83);

		}

		break;

	case SND_SOC_DAPM_POST_PMD:
@@ -2021,14 +2034,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,

					0x80, 0x00);

		if (msm8x16_wcd->spk_boost_set) {

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_ANALOG_BOOST_EN_CTL,

					0xDF, 0x5F);

			snd_soc_update_bits(codec,

					MSM8X16_WCD_A_DIGITAL_CDC_DIG_CLK_CTL,

					0x20, 0x00);

		}

	}

	return 0;

}