Merge "Revert "ASoC: wcd9335: enable APC in Tx path""

This commit is contained in:
Linux Build Service Account 2017-06-06 13:21:52 -07:00 committed by Gerrit - the friendly Code Review server
commit 9a3e66cffb

View file

@ -5906,8 +5906,6 @@ static int tasha_codec_enable_dec(struct snd_soc_dapm_widget *w,
CF_MIN_3DB_150HZ << 5); CF_MIN_3DB_150HZ << 5);
/* Enable TX PGA Mute */ /* Enable TX PGA Mute */
snd_soc_update_bits(codec, tx_vol_ctl_reg, 0x10, 0x10); snd_soc_update_bits(codec, tx_vol_ctl_reg, 0x10, 0x10);
/* Enable APC */
snd_soc_update_bits(codec, dec_cfg_reg, 0x08, 0x08);
break; break;
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
snd_soc_update_bits(codec, hpf_gate_reg, 0x01, 0x00); snd_soc_update_bits(codec, hpf_gate_reg, 0x01, 0x00);
@ -5934,7 +5932,6 @@ static int tasha_codec_enable_dec(struct snd_soc_dapm_widget *w,
hpf_cut_off_freq = hpf_cut_off_freq =
tasha->tx_hpf_work[decimator].hpf_cut_off_freq; tasha->tx_hpf_work[decimator].hpf_cut_off_freq;
snd_soc_update_bits(codec, tx_vol_ctl_reg, 0x10, 0x10); snd_soc_update_bits(codec, tx_vol_ctl_reg, 0x10, 0x10);
snd_soc_update_bits(codec, dec_cfg_reg, 0x08, 0x00);
if (cancel_delayed_work_sync( if (cancel_delayed_work_sync(
&tasha->tx_hpf_work[decimator].dwork)) { &tasha->tx_hpf_work[decimator].dwork)) {
if (hpf_cut_off_freq != CF_MIN_3DB_150HZ) { if (hpf_cut_off_freq != CF_MIN_3DB_150HZ) {