diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2015-02-27 08:06:45 -0700 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-09 14:13:56 +0200 |
| commit | eb1fde56dd4c8d02776f11931c2a3a23ad018fb5 (patch) | |
| tree | a44e6633e117726e73da4df0b5b9bb7ad54d0c42 | |
| parent | a9987afab81124074654de1237944f3f72723f69 (diff) | |
ASoC: sgtl5000: remove useless register write clearing CHRGPUMP_POWERUP
commit c7d910b87d3c8e9fcf4077089ca4327c12eee099 upstream.
The SGTL5000_CHIP_ANA_POWER register is cached. Update the cached
value instead of writing it directly.
Patch inspired by Russell King's more colorful remarks in this
patch:
https://github.com/SolidRun/linux-imx6-3.14/commit/dd4bf6a
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | sound/soc/codecs/sgtl5000.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index ba73f832e455..cc2d29cee002 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1197,13 +1197,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; lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO << |