summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2010-01-28 16:28:55 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-29 14:31:03 +0000
commit640b796f2ca88113bf2fefd380bc807092ce6fa1 (patch)
tree5de515ae125378e311a27163aa508db5fc88e863 /sound/soc
parent9f5b64b767203131a7a3a280859e70d4413c9672 (diff)
downloadop-kernel-dev-640b796f2ca88113bf2fefd380bc807092ce6fa1.zip
op-kernel-dev-640b796f2ca88113bf2fefd380bc807092ce6fa1.tar.gz
ASoC: remove bogus SLEEP mode from wm8978 driver
Tests showed, that bit 6 of the WM8978_POWER_MANAGEMENT_2 register of wm8978 affects codec clocks. Being useless for suspend / resume, it cannot be used in bias-level control either. Remove this bit handling. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8978.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c
index d9d4e9d..8dcebaa8 100644
--- a/sound/soc/codecs/wm8978.c
+++ b/sound/soc/codecs/wm8978.c
@@ -873,8 +873,6 @@ static int wm8978_suspend(struct platform_device *pdev, pm_message_t state)
wm8978_set_bias_level(codec, SND_SOC_BIAS_OFF);
/* Also switch PLL off */
snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1, 0);
- /* Put to sleep */
- snd_soc_write(codec, WM8978_POWER_MANAGEMENT_2, 0x40);
return 0;
}
@@ -887,9 +885,6 @@ static int wm8978_resume(struct platform_device *pdev)
int i;
u16 *cache = codec->reg_cache;
- /* Wake up the codec */
- snd_soc_write(codec, WM8978_POWER_MANAGEMENT_2, 0);
-
/* Sync reg_cache with the hardware */
for (i = 0; i < ARRAY_SIZE(wm8978_reg); i++) {
if (i == WM8978_RESET)
OpenPOWER on IntegriCloud