summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Nelson <eric.nelson@boundarydevices.com>2015-02-27 17:37:43 -0700
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2015-05-13 09:37:42 +0200
commit202483c148322e527b14863c59f3ffff93aeec69 (patch)
tree891d8a0d8c4d5adc1c0946fdd86c520b74ba3d56
parente9bb09af41b06b3cac4c602a2b800c3444288003 (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) (cherry picked from commit 8a8b303a7431e66a7ec6ec52bc0e04ed0a1335d0)
-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 be1859739ca2..96bd0e3508ef 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -1164,12 +1164,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;