Message ID | 20190906194636.217881-3-cujomalainey@chromium.org (mailing list archive) |
---|---|
State | Accepted |
Commit | dfe58f2011595e7512bde9dffbd0abfc3a736ab7 |
Headers | show |
Series | Add Samus Hotwording for RT5677 | expand |
On Fri, Sep 06, 2019 at 12:46:24PM -0700, Curtis Malainey wrote: > From: Ben Zhang <benzh@chromium.org> > > Instead of clearing RT5677_PWR_ANLG2 (MX-64h) to 0 at SND_SOC_BIAS_OFF, > we only clear the RT5677_PWR_CORE bit which is set at SND_SOC_BIAS_PREPARE. > MICBIAS control bits are left unchanged. This is a bug fix so should have been at the start of the series rather than depending on the naming changes you had as patch 1.
On Mon, Sep 9, 2019 at 2:54 AM Mark Brown <broonie@kernel.org> wrote: > > On Fri, Sep 06, 2019 at 12:46:24PM -0700, Curtis Malainey wrote: > > From: Ben Zhang <benzh@chromium.org> > > > > Instead of clearing RT5677_PWR_ANLG2 (MX-64h) to 0 at SND_SOC_BIAS_OFF, > > we only clear the RT5677_PWR_CORE bit which is set at SND_SOC_BIAS_PREPARE. > > MICBIAS control bits are left unchanged. > > This is a bug fix so should have been at the start of the series > rather than depending on the naming changes you had as patch 1. Got it, will send bug fixes to the bottom of future series.
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 5b6ca3ced13b..315a3d39bc09 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -4493,11 +4493,11 @@ static int rt5677_set_bias_level(struct snd_soc_component *component, case SND_SOC_BIAS_OFF: regmap_update_bits(rt5677->regmap, RT5677_DIG_MISC, 0x1, 0x0); regmap_write(rt5677->regmap, RT5677_PWR_DIG1, 0x0000); - regmap_write(rt5677->regmap, RT5677_PWR_DIG2, 0x0000); regmap_write(rt5677->regmap, RT5677_PWR_ANLG1, 2 << RT5677_LDO1_SEL_SFT | 2 << RT5677_LDO2_SEL_SFT); - regmap_write(rt5677->regmap, RT5677_PWR_ANLG2, 0x0000); + regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG2, + RT5677_PWR_CORE, 0); regmap_update_bits(rt5677->regmap, RT5677_PR_BASE + RT5677_BIAS_CUR4, 0x0f00, 0x0000);