diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-01 13:53:37 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:37:06 -0800 |
| commit | 22bef71b2e411ee05b9b9199394c3a209924926f (patch) | |
| tree | cf57990dc679b504ff9e01836be586063fb8d96c /sound | |
| parent | 6601dc2a3a0518851fd47b8a7e34e624c3ddceef (diff) | |
| download | kernel_samsung_smdk4412-22bef71b2e411ee05b9b9199394c3a209924926f.zip kernel_samsung_smdk4412-22bef71b2e411ee05b9b9199394c3a209924926f.tar.gz kernel_samsung_smdk4412-22bef71b2e411ee05b9b9199394c3a209924926f.tar.bz2 | |
ASoC: Ensure the WM8962 oscillator and PLLs start up disabled
commit 2af8de8c39cf58e5a5e40a9d5d71332da98e6ba7 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 ebff8ad..4a0f666 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3829,6 +3829,11 @@ static int wm8962_probe(struct snd_soc_codec *codec) */ snd_soc_update_bits(codec, WM8962_CLOCKING2, WM8962_SYSCLK_ENA, 0); + /* Ensure that the oscillator and PLLs are disabled */ + snd_soc_update_bits(codec, WM8962_PLL2, + WM8962_OSC_ENA | WM8962_PLL2_ENA | WM8962_PLL3_ENA, + 0); + regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies); if (pdata) { |