Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next

diff --combined sound/soc/codecs/wm8960.c
index a64b93425ae3367051cba0ef0a5f59a233abd2ee,3fea242cbf1ad9eb969c204e8c62dce8a4186ed5..0a4ffdd1d2a70eb19c22445365d0acc5cc854dee
--- 1/sound/soc/codecs/wm8960.c
--- 2/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@@ -53,8 -53,8 +53,8 @@@
   * using 2 wire for device control, so we cache them instead.
   */
  static const struct reg_default wm8960_reg_defaults[] = {
 -      {  0x0, 0x0097 },
 -      {  0x1, 0x0097 },
 +      {  0x0, 0x00a7 },
 +      {  0x1, 0x00a7 },
        {  0x2, 0x0000 },
        {  0x3, 0x0000 },
        {  0x4, 0x0000 },
@@@ -204,6 -204,7 +204,7 @@@ static const DECLARE_TLV_DB_SCALE(adc_t
  static const DECLARE_TLV_DB_SCALE(dac_tlv, -12700, 50, 1);
  static const DECLARE_TLV_DB_SCALE(bypass_tlv, -2100, 300, 0);
  static const DECLARE_TLV_DB_SCALE(out_tlv, -12100, 100, 1);
+ static const DECLARE_TLV_DB_SCALE(boost_tlv, -1200, 300, 1);
  
  static const struct snd_kcontrol_new wm8960_snd_controls[] = {
  SOC_DOUBLE_R_TLV("Capture Volume", WM8960_LINVOL, WM8960_RINVOL,
@@@ -213,6 -214,15 +214,15 @@@ SOC_DOUBLE_R("Capture Volume ZC Switch"
  SOC_DOUBLE_R("Capture Switch", WM8960_LINVOL, WM8960_RINVOL,
        7, 1, 0),
  
+ SOC_SINGLE_TLV("Right Input Boost Mixer RINPUT3 Volume",
+              WM8960_INBMIX1, 4, 7, 0, boost_tlv),
+ SOC_SINGLE_TLV("Right Input Boost Mixer RINPUT2 Volume",
+              WM8960_INBMIX1, 1, 7, 0, boost_tlv),
+ SOC_SINGLE_TLV("Left Input Boost Mixer LINPUT3 Volume",
+              WM8960_INBMIX2, 4, 7, 0, boost_tlv),
+ SOC_SINGLE_TLV("Left Input Boost Mixer LINPUT2 Volume",
+              WM8960_INBMIX2, 1, 7, 0, boost_tlv),
+ 
  SOC_DOUBLE_R_TLV("Playback Volume", WM8960_LDAC, WM8960_RDAC,
                 0, 255, 0, dac_tlv),
  
@@@ -323,8 -333,8 +333,8 @@@ SND_SOC_DAPM_MIXER("Left Input Mixer", 
  SND_SOC_DAPM_MIXER("Right Input Mixer", WM8960_POWER3, 4, 0,
                   wm8960_rin, ARRAY_SIZE(wm8960_rin)),
  
 -SND_SOC_DAPM_ADC("Left ADC", "Capture", WM8960_POWER2, 3, 0),
 -SND_SOC_DAPM_ADC("Right ADC", "Capture", WM8960_POWER2, 2, 0),
 +SND_SOC_DAPM_ADC("Left ADC", "Capture", WM8960_POWER1, 3, 0),
 +SND_SOC_DAPM_ADC("Right ADC", "Capture", WM8960_POWER1, 2, 0),
  
  SND_SOC_DAPM_DAC("Left DAC", "Playback", WM8960_POWER2, 8, 0),
  SND_SOC_DAPM_DAC("Right DAC", "Playback", WM8960_POWER2, 7, 0),