Merge remote-tracking branches 'asoc/fix/rt5677', 'asoc/fix/st', 'asoc/fix/sun4i...

diff --cc sound/soc/codecs/wm8960.c
index 056375339ea32948207723b1affd84ebdd0b1730,e3b7d0c57411870176c5e1e1398101f5641f77ad,056375339ea32948207723b1affd84ebdd0b1730,056375339ea32948207723b1affd84ebdd0b1730,056375339ea32948207723b1affd84ebdd0b1730,bbe24275f8c938c2fef6eb743e45395ca235d744,056375339ea32948207723b1affd84ebdd0b1730..5380798883b5d342df4dee0ffdd54e3b474ceac6
--- 1/sound/soc/codecs/wm8960.c
--- 2/sound/soc/codecs/wm8960.c
--- 3/sound/soc/codecs/wm8960.c
--- 4/sound/soc/codecs/wm8960.c
--- 5/sound/soc/codecs/wm8960.c
--- 6/sound/soc/codecs/wm8960.c
--- 7/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),

diff --cc sound/soc/soc-topology.c
Simple merge