diff options
author | Mark Brown <broonie@kernel.org> | 2016-01-05 23:07:33 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-01-05 23:07:33 +0000 |
commit | 84a5347b89690aae2c9d08f64219d71108c70011 (patch) | |
tree | 8a5563837ab4cca88e4eae5e65e81ebe149f2555 /sound/soc/codecs/rt5645.c | |
parent | 449af266fccdc79300abe9cb533ebcab2c4c736b (diff) | |
parent | ca8457bb02d8ecddf7f49ab874127dd4df782b16 (diff) | |
download | linux-84a5347b89690aae2c9d08f64219d71108c70011.tar.bz2 |
Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/rt5645.c')
-rw-r--r-- | sound/soc/codecs/rt5645.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index ef76940f9dcb..3e3c7f6be29d 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -1667,9 +1667,13 @@ static int rt5645_spk_event(struct snd_soc_dapm_widget *w, RT5645_PWR_CLS_D_L, RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R | RT5645_PWR_CLS_D_L); + snd_soc_update_bits(codec, RT5645_GEN_CTRL3, + RT5645_DET_CLK_MASK, RT5645_DET_CLK_MODE1); break; case SND_SOC_DAPM_PRE_PMD: + snd_soc_update_bits(codec, RT5645_GEN_CTRL3, + RT5645_DET_CLK_MASK, RT5645_DET_CLK_DIS); snd_soc_write(codec, RT5645_EQ_CTRL2, 0); snd_soc_update_bits(codec, RT5645_PWR_DIG1, RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R | |