aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-10-29 15:41:17 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-01 09:21:08 -0400
commit6d212d8e86fb4221bd91b9266b7567ee2b83bd01 (patch)
tree7adb2eccc5200937fefaed02bf2a4594e0312d31 /sound
parentc593b520cf70b0672680da04cc1e8c5f93bd739d (diff)
downloadmrst-s0i3-test-6d212d8e86fb4221bd91b9266b7567ee2b83bd01.tar.gz
mrst-s0i3-test-6d212d8e86fb4221bd91b9266b7567ee2b83bd01.tar.xz
mrst-s0i3-test-6d212d8e86fb4221bd91b9266b7567ee2b83bd01.zip
ASoC: Remove volatility from WM8900 POWER1 register
Not all bits can be read back from POWER1 so avoid corruption when using a read/modify/write cycle by marking it non-volatile - the only thing we read back from it is the chip revision which has diagnostic value only. We can re-add later but that's a more invasive change than is suitable for a bugfix. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Cc: stable@kernel.org
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8900.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index b4f11724a63..aca4b1ea10b 100644
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -186,7 +186,6 @@ static int wm8900_volatile_register(unsigned int reg)
{
switch (reg) {
case WM8900_REG_ID:
- case WM8900_REG_POWER1:
return 1;
default:
return 0;
@@ -1200,11 +1199,6 @@ static int wm8900_probe(struct snd_soc_codec *codec)
return -ENODEV;
}
- /* Read back from the chip */
- reg = snd_soc_read(codec, WM8900_REG_POWER1);
- reg = (reg >> 12) & 0xf;
- dev_info(codec->dev, "WM8900 revision %d\n", reg);
-
wm8900_reset(codec);
/* Turn the chip on */