Skip to content

Commit

Permalink
ASoC: sgtl5000: Do not disable regulators in SND_SOC_BIAS_OFF
Browse files Browse the repository at this point in the history
Disabling the SGTL5000 through regulators would certainly save more
power than simply disabling the reference voltages as described in the
data sheet, but won't properly restore things on resume.

This driver does not support active regulators. So we simply disable the
reference bias currents.

Signed-off-by: Eric Nelson <eric@nelint.com>
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Eric Nelson authored and Mark Brown committed Jun 15, 2016
1 parent 08dea16 commit 8419caa
Showing 1 changed file with 5 additions and 30 deletions.
35 changes: 5 additions & 30 deletions sound/soc/codecs/sgtl5000.c
Original file line number Diff line number Diff line change
Expand Up @@ -761,42 +761,17 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream,
static int sgtl5000_set_bias_level(struct snd_soc_codec *codec,
enum snd_soc_bias_level level)
{
int ret;
struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec);

switch (level) {
case SND_SOC_BIAS_ON:
case SND_SOC_BIAS_PREPARE:
break;
case SND_SOC_BIAS_STANDBY:
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) {
ret = regulator_bulk_enable(
sgtl5000->num_supplies,
sgtl5000->supplies);
if (ret)
return ret;
udelay(10);

regcache_cache_only(sgtl5000->regmap, false);

ret = regcache_sync(sgtl5000->regmap);
if (ret != 0) {
dev_err(codec->dev,
"Failed to restore cache: %d\n", ret);

regcache_cache_only(sgtl5000->regmap, true);
regulator_bulk_disable(sgtl5000->num_supplies,
sgtl5000->supplies);

return ret;
}
}

snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER,
SGTL5000_REFTOP_POWERUP,
SGTL5000_REFTOP_POWERUP);
break;
case SND_SOC_BIAS_OFF:
regcache_cache_only(sgtl5000->regmap, true);
regulator_bulk_disable(sgtl5000->num_supplies,
sgtl5000->supplies);
snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER,
SGTL5000_REFTOP_POWERUP, 0);
break;
}

Expand Down

0 comments on commit 8419caa

Please sign in to comment.