From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 20 Aug 2012 19:53:14 +0000 (+0100)
Subject: Merge tag 'asoc-3.6' into asoc-next
X-Git-Tag: next-20120821~51^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c59c8de8c503333ab0b200e1ee66f4cc6bedaab6;p=karo-tx-linux.git

Merge tag 'asoc-3.6' into asoc-next

ASoC: Additional updates for 3.6

A batch more bugfixes, all driver-specific and fairly small and
unremarkable in a global context.  The biggest batch are for the newly
added Arizona drivers.
---

c59c8de8c503333ab0b200e1ee66f4cc6bedaab6
diff --cc sound/soc/codecs/wm9712.c
index c9c696ca76f7,c6d2076a796b..f6baf9c0998d
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@@ -146,9 -146,9 +146,9 @@@ SOC_SINGLE("Playback Attenuate (-6dB) S
  SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 1),
  SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 1),
  
 -SOC_SINGLE("Capture ADC Switch", AC97_REC_GAIN, 15, 1, 1),
 +SOC_SINGLE("Capture Switch", AC97_REC_GAIN, 15, 1, 1),
  SOC_ENUM("Capture Volume Steps", wm9712_enum[6]),
- SOC_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 63, 1),
+ SOC_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 63, 0),
  SOC_SINGLE("Capture ZC Switch", AC97_REC_GAIN, 7, 1, 0),
  
  SOC_SINGLE_TLV("Mic 1 Volume", AC97_MIC, 8, 31, 1, main_tlv),