summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Nelson <eric.nelson@boundarydevices.com>2015-02-27 17:37:43 -0700
committerMax Krummenacher <max.krummenacher@toradex.com>2015-03-09 16:41:01 +0100
commit8a8b303a7431e66a7ec6ec52bc0e04ed0a1335d0 (patch)
treefa056e3ecec58929a19054775cf88e39492ef9dc
parentf0843868acdcfaa2767c6ae248f57d940247f7bd (diff)
ASoC: sgtl5000: remove useless register write clearing
CHRGPUMP_POWERUP The SGTL5000_CHIP_ANA_POWER register is cached. Update the cached value instead of writing it directly. Upstream-status: sent Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> (cherry picked from commit 309abdeda8c9331013f25b1a1209d9ce8334237b)
-rw-r--r--sound/soc/codecs/sgtl5000.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index 2780cf49c457..955690ddca11 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -1140,12 +1140,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)
/* Enable VDDC charge pump */
ana_pwr |= SGTL5000_VDDC_CHRGPMP_POWERUP;
} else if (vddio >= 3100 && vdda >= 3100) {
- /*
- * if vddio and vddd > 3.1v,
- * charge pump should be clean before set ana_pwr
- */
- snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER,
- SGTL5000_VDDC_CHRGPMP_POWERUP, 0);
+ ana_pwr &= ~SGTL5000_VDDC_CHRGPMP_POWERUP;
/* VDDC use VDDIO rail */
lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD;