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

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

Merge "ASoC: wcd9335: Update TX gain correctly after decimator enable"

parents e494b6d5 2a6e452c

sound/soc/codecs/wcd9335.c

+5 −0
Original line number Diff line number Diff line
@@ -5300,6 +5300,7 @@ static int tasha_codec_enable_dec(struct snd_soc_dapm_widget *w, 
	char *wname;

	int ret = 0, amic_n;

	u16 tx_vol_ctl_reg, pwr_level_reg = 0, dec_cfg_reg, hpf_gate_reg;

	u16 tx_gain_ctl_reg;

	char *dec;

	u8 hpf_cut_off_freq;

	struct tasha_priv *tasha = snd_soc_codec_get_drvdata(codec);
@@ -5342,6 +5343,7 @@ static int tasha_codec_enable_dec(struct snd_soc_dapm_widget *w, 
	tx_vol_ctl_reg = WCD9335_CDC_TX0_TX_PATH_CTL + 16 * decimator;

	hpf_gate_reg = WCD9335_CDC_TX0_TX_PATH_SEC2 + 16 * decimator;

	dec_cfg_reg = WCD9335_CDC_TX0_TX_PATH_CFG0 + 16 * decimator;

	tx_gain_ctl_reg = WCD9335_CDC_TX0_TX_VOL_CTL + 16 * decimator;



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:
@@ -5397,6 +5399,9 @@ static int tasha_codec_enable_dec(struct snd_soc_dapm_widget *w, 
			schedule_delayed_work(

					&tasha->tx_hpf_work[decimator].dwork,

					msecs_to_jiffies(300));

		/* apply gain after decimator is enabled */

		snd_soc_write(codec, tx_gain_ctl_reg,

			      snd_soc_read(codec, tx_gain_ctl_reg));

		break;

	case SND_SOC_DAPM_PRE_PMD:

		snd_soc_update_bits(codec, tx_vol_ctl_reg, 0x10, 0x10);