diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-29 11:21:08 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-29 11:21:08 -0700 |
| commit | a888aabc8015049d086b02fdbd8d409d21b5f829 (patch) | |
| tree | a1cacb7c50f21e6d938df8c48dfed7e89a7b9f1f /sound | |
| parent | 6d162862f4c53ca925468e3c87d328878946d2a6 (diff) | |
| parent | d07060d4f160c7ad8c02ff0ce01c0a215372c28e (diff) | |
Merge "ASoC: wcd934x: enable rate converter clock for AANC"
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wcd934x/wcd934x.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sound/soc/codecs/wcd934x/wcd934x.c b/sound/soc/codecs/wcd934x/wcd934x.c index 56a2ab8ed285..6341cf8a39e6 100644 --- a/sound/soc/codecs/wcd934x/wcd934x.c +++ b/sound/soc/codecs/wcd934x/wcd934x.c @@ -1033,17 +1033,15 @@ static int tavil_codec_enable_anc(struct snd_soc_dapm_widget *w, snd_soc_write(codec, reg, (val & mask)); } + /* Rate converter clk enable and set bypass mode */ + snd_soc_update_bits(codec, WCD934X_CDC_ANC0_RC_COMMON_CTL, + 0x05, 0x05); if (!hwdep_cal) release_firmware(fw); break; - case SND_SOC_DAPM_POST_PMU: - /* Remove ANC Rx from reset */ - snd_soc_update_bits(codec, WCD934X_CDC_ANC0_CLK_RESET_CTL, - 0x08, 0x00); - snd_soc_update_bits(codec, WCD934X_CDC_ANC1_CLK_RESET_CTL, - 0x08, 0x00); - break; case SND_SOC_DAPM_POST_PMD: + snd_soc_update_bits(codec, WCD934X_CDC_ANC0_RC_COMMON_CTL, + 0x05, 0x00); if (!strcmp(w->name, "ANC EAR PA") || !strcmp(w->name, "ANC SPK1 PA")) { snd_soc_update_bits(codec, WCD934X_CDC_ANC0_MODE_1_CTL, |