From: Mark Brown <broonie@kernel.org>
Date: Wed, 25 Nov 2015 17:57:54 +0000 (+0000)
Subject: Merge remote-tracking branches 'asoc/fix/rt5677', 'asoc/fix/st', 'asoc/fix/sun4i... 
X-Git-Tag: v4.4-rc4~11^2~3^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=923f1cbf2e45f6292a01de959031a8efeabede78;p=linux-2.6-block.git

Merge remote-tracking branches 'asoc/fix/rt5677', 'asoc/fix/st', 'asoc/fix/sun4i-codec', 'asoc/fix/topology', 'asoc/fix/wm8960' and 'asoc/fix/wm8962' into asoc-linus
---

923f1cbf2e45f6292a01de959031a8efeabede78
diff --cc sound/soc/codecs/wm8960.c
index 056375339ea3,e3b7d0c57411,056375339ea3,056375339ea3,056375339ea3,bbe24275f8c9,056375339ea3..5380798883b5
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@@@@@@@ -229,20 -223,16 -229,20 -229,20 -229,20 -223,16 -229,20 +229,20 @@@@@@@@ SOC_DOUBLE_R_TLV("Capture Volume", WM89
       SOC_DOUBLE_R("Capture Volume ZC Switch", WM8960_LINVOL, WM8960_RINVOL,
       	6, 1, 0),
       SOC_DOUBLE_R("Capture Switch", WM8960_LINVOL, WM8960_RINVOL,
----- -	7, 1, 0),
+++++ +	7, 1, 1),
       
       SOC_SINGLE_TLV("Right Input Boost Mixer RINPUT3 Volume",
 -   - 	       WM8960_INBMIX1, 4, 7, 0, boost_tlv),
 +   + 	       WM8960_INBMIX1, 4, 7, 0, lineinboost_tlv),
       SOC_SINGLE_TLV("Right Input Boost Mixer RINPUT2 Volume",
 -   - 	       WM8960_INBMIX1, 1, 7, 0, boost_tlv),
 +   + 	       WM8960_INBMIX1, 1, 7, 0, lineinboost_tlv),
       SOC_SINGLE_TLV("Left Input Boost Mixer LINPUT3 Volume",
 -   - 	       WM8960_INBMIX2, 4, 7, 0, boost_tlv),
 +   + 	       WM8960_INBMIX2, 4, 7, 0, lineinboost_tlv),
       SOC_SINGLE_TLV("Left Input Boost Mixer LINPUT2 Volume",
 -   - 	       WM8960_INBMIX2, 1, 7, 0, boost_tlv),
 +   + 	       WM8960_INBMIX2, 1, 7, 0, lineinboost_tlv),
 +   + SOC_SINGLE_TLV("Right Input Boost Mixer RINPUT1 Volume",
 +   + 		WM8960_RINPATH, 4, 3, 0, micboost_tlv),
 +   + SOC_SINGLE_TLV("Left Input Boost Mixer LINPUT1 Volume",
 +   + 		WM8960_LINPATH, 4, 3, 0, micboost_tlv),
       
       SOC_DOUBLE_R_TLV("Playback Volume", WM8960_LDAC, WM8960_RDAC,
       		 0, 255, 0, dac_tlv),