diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-30 13:23:35 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-09 09:11:10 -0400 |
commit | 52c0eee3329b08dfd912a59e0246e21026308301 (patch) | |
tree | f022e832d20062ac37e173029f81b7027719f08b /sound/soc/codecs | |
parent | 8b5eae137b91cb2db15fe2c5a913cafde4629339 (diff) |
ASoC: wm8962: Don't duplicate bias level management in resume
The core will bring the bias level up for us since we use idle_bias_off,
duplicating this may be harmful.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/wm8962.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index aa9ce9dd7d8a..ce6720073798 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c | |||
@@ -3733,21 +3733,6 @@ static int wm8962_runtime_resume(struct device *dev) | |||
3733 | 3733 | ||
3734 | regcache_sync(wm8962->regmap); | 3734 | regcache_sync(wm8962->regmap); |
3735 | 3735 | ||
3736 | regmap_update_bits(wm8962->regmap, WM8962_ANTI_POP, | ||
3737 | WM8962_STARTUP_BIAS_ENA | WM8962_VMID_BUF_ENA, | ||
3738 | WM8962_STARTUP_BIAS_ENA | WM8962_VMID_BUF_ENA); | ||
3739 | |||
3740 | /* Bias enable at 2*50k for ramp */ | ||
3741 | regmap_update_bits(wm8962->regmap, WM8962_PWR_MGMT_1, | ||
3742 | WM8962_VMID_SEL_MASK | WM8962_BIAS_ENA, | ||
3743 | WM8962_BIAS_ENA | 0x180); | ||
3744 | |||
3745 | msleep(5); | ||
3746 | |||
3747 | /* VMID back to 2x250k for standby */ | ||
3748 | regmap_update_bits(wm8962->regmap, WM8962_PWR_MGMT_1, | ||
3749 | WM8962_VMID_SEL_MASK, 0x100); | ||
3750 | |||
3751 | return 0; | 3736 | return 0; |
3752 | } | 3737 | } |
3753 | 3738 | ||