Merge "ASoC: wcd9335: Update decimator filter cutoff frequency"

This commit is contained in:
Linux Build Service Account 2016-07-13 15:45:38 -07:00 committed by Gerrit - the friendly Code Review server
commit aa958278d1

View file

@ -5719,9 +5719,20 @@ static int tasha_codec_enable_dec(struct snd_soc_dapm_widget *w,
msecs_to_jiffies(300));
break;
case SND_SOC_DAPM_PRE_PMD:
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, dec_cfg_reg, 0x08, 0x00);
cancel_delayed_work_sync(&tasha->tx_hpf_work[decimator].dwork);
if (cancel_delayed_work_sync(
&tasha->tx_hpf_work[decimator].dwork)) {
if (hpf_cut_off_freq != CF_MIN_3DB_150HZ) {
tasha_codec_vote_max_bw(codec, true);
snd_soc_update_bits(codec, dec_cfg_reg,
TX_HPF_CUT_OFF_FREQ_MASK,
hpf_cut_off_freq << 5);
tasha_codec_vote_max_bw(codec, false);
}
}
cancel_delayed_work_sync(
&tasha->tx_mute_dwork[decimator].dwork);
break;