Home| summaryrefslogtreecommitdiff |
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-03 20:27:49 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-03 20:27:49 (GMT) |
| commit | 39fcddc24caa8cda5db70ac62ae743a02551fec5 (patch) (unidiff) | |
| tree | 5b762b8d96873ab3b94f52ec12ec3cc57b47da69 | |
| parent | 63fb1539735afe7c76e7ccdf1999f1fc0d7434e1 (diff) | |
Revert "ASoC: Don't go through cache when applying WM5100 rev A updates"
This reverts commit 78fd75340768980ce6ca646106762a6928289e0c (upstream
commit 495174a8ffbaa0d15153d855cf206cdc46d51cf4) as it breaks the build.
Reported-by: Tim Gardner <rtg.canonical@gmail.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | sound/soc/codecs/wm5100.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index c745ce8..42d9039 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c | |||
| @@ -1379,7 +1379,6 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec, | |||
| 1379 | 1379 | ||
| 1380 | switch (wm5100->rev) { | 1380 | switch (wm5100->rev) { |
| 1381 | case 0: | 1381 | case 0: |
| 1382 | regcache_cache_bypass(wm5100->regmap, true); | ||
| 1383 | snd_soc_write(codec, 0x11, 0x3); | 1382 | snd_soc_write(codec, 0x11, 0x3); |
| 1384 | snd_soc_write(codec, 0x203, 0xc); | 1383 | snd_soc_write(codec, 0x203, 0xc); |
| 1385 | snd_soc_write(codec, 0x206, 0); | 1384 | snd_soc_write(codec, 0x206, 0); |
| @@ -1395,7 +1394,6 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec, | |||
| 1395 | snd_soc_write(codec, | 1394 | snd_soc_write(codec, |
| 1396 | wm5100_reva_patches[i].reg, | 1395 | wm5100_reva_patches[i].reg, |
| 1397 | wm5100_reva_patches[i].val); | 1396 | wm5100_reva_patches[i].val); |
| 1398 | regcache_cache_bypass(wm5100->regmap, false); | ||
| 1399 | break; | 1397 | break; |
| 1400 | default: | 1398 | default: |
| 1401 | break; | 1399 | break; |