diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-01 09:53:37 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-01 14:51:49 -0400 |
commit | 2af8de8c39cf58e5a5e40a9d5d71332da98e6ba7 (patch) | |
tree | 456be1b86b3928da68a7bdfd1641ffb4046ae7bd /sound | |
parent | 4f4488abc97c1c27ff029f887944e6a6da1f5733 (diff) |
ASoC: Ensure the WM8962 oscillator and PLLs start up disabled
Since there is no current software control for these they would otherwise
be left enabled, consuming power.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/wm8962.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 32d931f1122c..a0c895b2d53b 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c | |||
@@ -4035,6 +4035,11 @@ static int wm8962_probe(struct snd_soc_codec *codec) | |||
4035 | snd_soc_update_bits(codec, WM8962_CLOCKING2, | 4035 | snd_soc_update_bits(codec, WM8962_CLOCKING2, |
4036 | WM8962_CLKREG_OVD, WM8962_CLKREG_OVD); | 4036 | WM8962_CLKREG_OVD, WM8962_CLKREG_OVD); |
4037 | 4037 | ||
4038 | /* Ensure that the oscillator and PLLs are disabled */ | ||
4039 | snd_soc_update_bits(codec, WM8962_PLL2, | ||
4040 | WM8962_OSC_ENA | WM8962_PLL2_ENA | WM8962_PLL3_ENA, | ||
4041 | 0); | ||
4042 | |||
4038 | regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies); | 4043 | regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies); |
4039 | 4044 | ||
4040 | if (pdata) { | 4045 | if (pdata) { |