Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc...

diff --cc sound/soc/codecs/Kconfig
index d54604fecd7fc291005a5fe2f7b4fb727eeeb160,4d82a58ff6b0b9c43c9f6f892ecbd6ab79e44de8,cf6d401fc823eca163434de6a2d8442583e2e9bf..1cd6ab344d67def61db455d956ac2d7075a1f6d8
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
--- 3/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@ -44,10 -43,9 -43,8 +44,10 @@@@ config SND_SOC_ALL_CODEC
        select SND_SOC_AK5386
        select SND_SOC_ALC5623 if I2C
        select SND_SOC_ALC5632 if I2C
  +     select SND_SOC_BT_SCO
        select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
        select SND_SOC_CS35L32 if I2C
 ++     select SND_SOC_CS35L33 if I2C
        select SND_SOC_CS42L51_I2C if I2C
        select SND_SOC_CS42L52 if I2C && INPUT
        select SND_SOC_CS42L56 if I2C && INPUT
@@@@ -382,9 -370,9 -367,6 +382,9 @@@@ config SND_SOC_ALC562
   config SND_SOC_ALC5632
        tristate
   
 -      tristate
  +config SND_SOC_BT_SCO
 ++     tristate "Dummy BT SCO codec driver"
  +
   config SND_SOC_CQ0093VC
        tristate
   
@@@@ -554,13 -532,9 -529,6 +554,13 @@@@ config SND_SOC_MAX9809
   config SND_SOC_MAX98357A
          tristate
   
  +config SND_SOC_MAX98371
  +       tristate
  +
 ++config SND_SOC_MAX98504
 ++     tristate "Maxim MAX98504 speaker amplifier"
 ++     depends on I2C
 ++
   config SND_SOC_MAX9867
        tristate