summaryrefslogtreecommitdiff
path: root/sound
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-05-29 13:43:43 +0200
commitd0aa16be2681816075622e78a8ff6955a86131a0 (patch)
tree04a98b01bf46a9bcd82a1e12dde3bb57652333a2 /sound
parent577102436199436cd504f083e8cbbc5e6902ac52 (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)
Diffstat (limited to 'sound')
-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 12528e9ac4c2..23552b7108e5 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -1198,12 +1198,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;