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 | |
| parent | 449af266fccdc79300abe9cb533ebcab2c4c736b (diff) | |
| parent | ca8457bb02d8ecddf7f49ab874127dd4df782b16 (diff) | |
| download | linux-stable-84a5347b89690aae2c9d08f64219d71108c70011.tar.gz linux-stable-84a5347b89690aae2c9d08f64219d71108c70011.tar.bz2 linux-stable-84a5347b89690aae2c9d08f64219d71108c70011.zip | |
Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/rt5645.c | 4 | ||||
| -rw-r--r-- | sound/soc/codecs/rt5645.h | 4 |
2 files changed, 8 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 | diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h index 093e46d559fb..205e0715c99a 100644 --- a/sound/soc/codecs/rt5645.h +++ b/sound/soc/codecs/rt5645.h @@ -2122,6 +2122,10 @@ enum { /* General Control3 (0xfc) */ #define RT5645_JD_PSV_MODE (0x1 << 12) #define RT5645_IRQ_CLK_GATE_CTRL (0x1 << 11) +#define RT5645_DET_CLK_MASK (0x3 << 9) +#define RT5645_DET_CLK_DIS (0x0 << 9) +#define RT5645_DET_CLK_MODE1 (0x1 << 9) +#define RT5645_DET_CLK_MODE2 (0x2 << 9) #define RT5645_MICINDET_MANU (0x1 << 7) #define RT5645_RING2_SLEEVE_GND (0x1 << 5) |