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.

diff --cc sound/soc/codecs/wm9712.c
index c9c696ca76f72d408da00f3fdaa43bc1a57908ec,c6d2076a796bd9aecf510636a0339e76abed2dde..f6baf9c0998df6f5738ec60c152531fcf9e2bfed
--- 1/sound/soc/codecs/wm9712.c
--- 2/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),