summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-19 11:16:37 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-20 13:54:33 +0000
commit495174a8ffbaa0d15153d855cf206cdc46d51cf4 (patch)
tree8d22305c5febfbd183ed82337ee42111aa45f21e /sound
parente53e417331c57b9b97e3f8be870214a02c99265c (diff)
downloadlinux-stable-495174a8ffbaa0d15153d855cf206cdc46d51cf4.tar.gz
linux-stable-495174a8ffbaa0d15153d855cf206cdc46d51cf4.tar.bz2
linux-stable-495174a8ffbaa0d15153d855cf206cdc46d51cf4.zip
ASoC: Don't go through cache when applying WM5100 rev A updates
These are all to either uncached registers or fixes to register defaults, in the former case the cache won't do anything and in the latter case we're fixing things so the cache sync will do the right thing. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@kernel.org
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm5100.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 3fd9cfe6dcd7..66f0611e68b6 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -1377,6 +1377,7 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec,
switch (wm5100->rev) {
case 0:
+ regcache_cache_bypass(wm5100->regmap, true);
snd_soc_write(codec, 0x11, 0x3);
snd_soc_write(codec, 0x203, 0xc);
snd_soc_write(codec, 0x206, 0);
@@ -1392,6 +1393,7 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec,
snd_soc_write(codec,
wm5100_reva_patches[i].reg,
wm5100_reva_patches[i].val);
+ regcache_cache_bypass(wm5100->regmap, false);
break;
default:
break;