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

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

Merge "ASoC: wcd9xxx: Fix codec regulator override"

parents 66d6a6b1 50ff05af

sound/soc/codecs/wcd934x/wcd934x.c

+2 −6
Original line number Diff line number Diff line
@@ -1882,10 +1882,6 @@ static void tavil_codec_override(struct snd_soc_codec *codec, int mode, 
		switch (event) {

		case SND_SOC_DAPM_PRE_PMU:

		case SND_SOC_DAPM_POST_PMU:

			if (!(snd_soc_read(codec,

					WCD934X_CDC_RX2_RX_PATH_CTL) & 0x10) &&

				(!(snd_soc_read(codec,

					WCD934X_CDC_RX1_RX_PATH_CTL) & 0x10)))

			snd_soc_update_bits(codec,

				WCD9XXX_A_ANA_RX_SUPPLIES, 0x02, 0x02);

		break;

sound/soc/codecs/wcd9xxx-common-v2.c

+5 −0
Original line number Diff line number Diff line
@@ -579,6 +579,11 @@ static void wcd_clsh_set_hph_mode(struct snd_soc_codec *codec, 
static void wcd_clsh_set_flyback_vneg_ctl(struct snd_soc_codec *codec,

					  bool enable)

{

	struct wcd9xxx *wcd9xxx = dev_get_drvdata(codec->dev->parent);



	if (!TASHA_IS_2_0(wcd9xxx))

		return;



	if (enable) {

		snd_soc_update_bits(codec, WCD9XXX_FLYBACK_VNEG_CTRL_1, 0xE0,

				    0x00);