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

diff --combined sound/soc/codecs/Kconfig
index 03242a4,f7f64bd..75f5712
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -43,6 -43,7 +43,7 @@@ 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_CS42L51_I2C if I2C
@@@ -64,7 -65,6 +65,6 @@@
        select SND_SOC_DA732X if I2C
        select SND_SOC_DA9055 if I2C
        select SND_SOC_DMIC
-       select SND_SOC_BT_SCO
        select SND_SOC_ES8328_SPI if SPI_MASTER
        select SND_SOC_ES8328_I2C if I2C
        select SND_SOC_GTM601
@@@ -79,7 -79,6 +79,7 @@@
        select SND_SOC_MAX98090 if I2C
        select SND_SOC_MAX98095 if I2C
        select SND_SOC_MAX98357A if GPIOLIB
 +      select SND_SOC_MAX98371 if I2C
        select SND_SOC_MAX9867 if I2C
        select SND_SOC_MAX98925 if I2C
        select SND_SOC_MAX98926 if I2C
@@@ -89,14 -88,12 +89,14 @@@
        select SND_SOC_MC13783 if MFD_MC13XXX
        select SND_SOC_ML26124 if I2C
        select SND_SOC_NAU8825 if I2C
 +      select SND_SOC_HDMI_CODEC
        select SND_SOC_PCM1681 if I2C
        select SND_SOC_PCM179X_I2C if I2C
        select SND_SOC_PCM179X_SPI if SPI_MASTER
        select SND_SOC_PCM3008
        select SND_SOC_PCM3168A_I2C if I2C
        select SND_SOC_PCM3168A_SPI if SPI_MASTER
 +      select SND_SOC_PCM5102A
        select SND_SOC_PCM512x_I2C if I2C
        select SND_SOC_PCM512x_SPI if SPI_MASTER
        select SND_SOC_RT286 if I2C
@@@ -127,14 -124,12 +127,14 @@@
        select SND_SOC_TAS2552 if I2C
        select SND_SOC_TAS5086 if I2C
        select SND_SOC_TAS571X if I2C
 +      select SND_SOC_TAS5720 if I2C
        select SND_SOC_TFA9879 if I2C
        select SND_SOC_TLV320AIC23_I2C if I2C
        select SND_SOC_TLV320AIC23_SPI if SPI_MASTER
        select SND_SOC_TLV320AIC26 if SPI_MASTER
        select SND_SOC_TLV320AIC31XX if I2C
 -      select SND_SOC_TLV320AIC32X4 if I2C
 +      select SND_SOC_TLV320AIC32X4_I2C if I2C
 +      select SND_SOC_TLV320AIC32X4_SPI if SPI_MASTER
        select SND_SOC_TLV320AIC3X if I2C
        select SND_SOC_TPA6130A2 if I2C
        select SND_SOC_TLV320DAC33 if I2C
@@@ -370,6 -365,9 +370,9 @@@ config SND_SOC_ALC562
  config SND_SOC_ALC5632
        tristate
  
+ config SND_SOC_BT_SCO
+       tristate
+ 
  config SND_SOC_CQ0093VC
        tristate
  
@@@ -476,17 -474,9 +479,14 @@@ config SND_SOC_DA732
  config SND_SOC_DA9055
        tristate
  
- config SND_SOC_BT_SCO
-       tristate
- 
  config SND_SOC_DMIC
        tristate
  
 +config SND_SOC_HDMI_CODEC
 +       tristate
 +       select SND_PCM_ELD
 +       select SND_PCM_IEC958
 +
  config SND_SOC_ES8328
        tristate "Everest Semi ES8328 CODEC"
  
@@@ -532,9 -522,6 +532,9 @@@ config SND_SOC_MAX9809
  config SND_SOC_MAX98357A
         tristate
  
 +config SND_SOC_MAX98371
 +       tristate
 +
  config SND_SOC_MAX9867
        tristate
  
@@@ -588,9 -575,6 +588,9 @@@ config SND_SOC_PCM3168A_SP
        select SND_SOC_PCM3168A
        select REGMAP_SPI
  
 +config SND_SOC_PCM5102A
 +      tristate
 +
  config SND_SOC_PCM512x
        tristate
  
@@@ -645,7 -629,6 +645,7 @@@ config SND_SOC_RT551
  
  config SND_SOC_RT5616
        tristate "Realtek RT5616 CODEC"
 +      depends on I2C
  
  config SND_SOC_RT5631
        tristate "Realtek ALC5631/RT5631 CODEC"
@@@ -754,15 -737,8 +754,15 @@@ config SND_SOC_TAS508
        depends on I2C
  
  config SND_SOC_TAS571X
 -      tristate "Texas Instruments TAS5711/TAS5717/TAS5719 power amplifiers"
 +      tristate "Texas Instruments TAS5711/TAS5717/TAS5719/TAS5721 power amplifiers"
 +      depends on I2C
 +
 +config SND_SOC_TAS5720
 +      tristate "Texas Instruments TAS5720 Mono Audio amplifier"
        depends on I2C
 +      help
 +        Enable support for Texas Instruments TAS5720L/M high-efficiency mono
 +        Class-D audio power amplifiers.
  
  config SND_SOC_TFA9879
        tristate "NXP Semiconductors TFA9879 amplifier"
@@@ -793,16 -769,6 +793,16 @@@ config SND_SOC_TLV320AIC31X
  config SND_SOC_TLV320AIC32X4
        tristate
  
 +config SND_SOC_TLV320AIC32X4_I2C
 +      tristate
 +      depends on I2C
 +      select SND_SOC_TLV320AIC32X4
 +
 +config SND_SOC_TLV320AIC32X4_SPI
 +      tristate
 +      depends on SPI_MASTER
 +      select SND_SOC_TLV320AIC32X4
 +
  config SND_SOC_TLV320AIC3X
        tristate "Texas Instruments TLV320AIC3x CODECs"
        depends on I2C

diff --combined sound/soc/codecs/Makefile
index 2620ee0,12a1fe2..0f548fd
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -32,6 -32,7 +32,7 @@@ snd-soc-ak4642-objs := ak4642.
  snd-soc-ak4671-objs := ak4671.o
  snd-soc-ak5386-objs := ak5386.o
  snd-soc-arizona-objs := arizona.o
+ snd-soc-bt-sco-objs := bt-sco.o
  snd-soc-cq93vc-objs := cq93vc.o
  snd-soc-cs35l32-objs := cs35l32.o
  snd-soc-cs42l51-objs := cs42l51.o
@@@ -55,7 -56,6 +56,6 @@@ snd-soc-da7218-objs := da7218.
  snd-soc-da7219-objs := da7219.o da7219-aad.o
  snd-soc-da732x-objs := da732x.o
  snd-soc-da9055-objs := da9055.o
- snd-soc-bt-sco-objs := bt-sco.o
  snd-soc-dmic-objs := dmic.o
  snd-soc-es8328-objs := es8328.o
  snd-soc-es8328-i2c-objs := es8328-i2c.o
@@@ -74,7 -74,6 +74,7 @@@ snd-soc-max98088-objs := max98088.
  snd-soc-max98090-objs := max98090.o
  snd-soc-max98095-objs := max98095.o
  snd-soc-max98357a-objs := max98357a.o
 +snd-soc-max98371-objs := max98371.o
  snd-soc-max9867-objs := max9867.o
  snd-soc-max98925-objs := max98925.o
  snd-soc-max98926-objs := max98926.o
@@@ -82,7 -81,6 +82,7 @@@ snd-soc-max9850-objs := max9850.
  snd-soc-mc13783-objs := mc13783.o
  snd-soc-ml26124-objs := ml26124.o
  snd-soc-nau8825-objs := nau8825.o
 +snd-soc-hdmi-codec-objs := hdmi-codec.o
  snd-soc-pcm1681-objs := pcm1681.o
  snd-soc-pcm179x-codec-objs := pcm179x.o
  snd-soc-pcm179x-i2c-objs := pcm179x-i2c.o
@@@ -91,7 -89,6 +91,7 @@@ snd-soc-pcm3008-objs := pcm3008.
  snd-soc-pcm3168a-objs := pcm3168a.o
  snd-soc-pcm3168a-i2c-objs := pcm3168a-i2c.o
  snd-soc-pcm3168a-spi-objs := pcm3168a-spi.o
 +snd-soc-pcm5102a-objs := pcm5102a.o
  snd-soc-pcm512x-objs := pcm512x.o
  snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o
  snd-soc-pcm512x-spi-objs := pcm512x-spi.o
@@@ -132,7 -129,6 +132,7 @@@ snd-soc-stac9766-objs := stac9766.
  snd-soc-sti-sas-objs := sti-sas.o
  snd-soc-tas5086-objs := tas5086.o
  snd-soc-tas571x-objs := tas571x.o
 +snd-soc-tas5720-objs := tas5720.o
  snd-soc-tfa9879-objs := tfa9879.o
  snd-soc-tlv320aic23-objs := tlv320aic23.o
  snd-soc-tlv320aic23-i2c-objs := tlv320aic23-i2c.o
@@@ -140,8 -136,6 +140,8 @@@ snd-soc-tlv320aic23-spi-objs := tlv320a
  snd-soc-tlv320aic26-objs := tlv320aic26.o
  snd-soc-tlv320aic31xx-objs := tlv320aic31xx.o
  snd-soc-tlv320aic32x4-objs := tlv320aic32x4.o
 +snd-soc-tlv320aic32x4-i2c-objs := tlv320aic32x4-i2c.o
 +snd-soc-tlv320aic32x4-spi-objs := tlv320aic32x4-spi.o
  snd-soc-tlv320aic3x-objs := tlv320aic3x.o
  snd-soc-tlv320dac33-objs := tlv320dac33.o
  snd-soc-ts3a227e-objs := ts3a227e.o
@@@ -247,6 -241,7 +247,7 @@@ obj-$(CONFIG_SND_SOC_AK5386)       += snd-soc
  obj-$(CONFIG_SND_SOC_ALC5623)    += snd-soc-alc5623.o
  obj-$(CONFIG_SND_SOC_ALC5632) += snd-soc-alc5632.o
  obj-$(CONFIG_SND_SOC_ARIZONA) += snd-soc-arizona.o
+ obj-$(CONFIG_SND_SOC_BT_SCO)  += snd-soc-bt-sco.o
  obj-$(CONFIG_SND_SOC_CQ0093VC) += snd-soc-cq93vc.o
  obj-$(CONFIG_SND_SOC_CS35L32) += snd-soc-cs35l32.o
  obj-$(CONFIG_SND_SOC_CS42L51) += snd-soc-cs42l51.o
@@@ -270,7 -265,6 +271,6 @@@ obj-$(CONFIG_SND_SOC_DA7218)       += snd-soc
  obj-$(CONFIG_SND_SOC_DA7219)  += snd-soc-da7219.o
  obj-$(CONFIG_SND_SOC_DA732X)  += snd-soc-da732x.o
  obj-$(CONFIG_SND_SOC_DA9055)  += snd-soc-da9055.o
- obj-$(CONFIG_SND_SOC_BT_SCO)  += snd-soc-bt-sco.o
  obj-$(CONFIG_SND_SOC_DMIC)    += snd-soc-dmic.o
  obj-$(CONFIG_SND_SOC_ES8328)  += snd-soc-es8328.o
  obj-$(CONFIG_SND_SOC_ES8328_I2C)+= snd-soc-es8328-i2c.o
@@@ -296,7 -290,6 +296,7 @@@ obj-$(CONFIG_SND_SOC_MAX9850)      += snd-so
  obj-$(CONFIG_SND_SOC_MC13783) += snd-soc-mc13783.o
  obj-$(CONFIG_SND_SOC_ML26124) += snd-soc-ml26124.o
  obj-$(CONFIG_SND_SOC_NAU8825)   += snd-soc-nau8825.o
 +obj-$(CONFIG_SND_SOC_HDMI_CODEC)      += snd-soc-hdmi-codec.o
  obj-$(CONFIG_SND_SOC_PCM1681) += snd-soc-pcm1681.o
  obj-$(CONFIG_SND_SOC_PCM179X) += snd-soc-pcm179x-codec.o
  obj-$(CONFIG_SND_SOC_PCM179X_I2C)     += snd-soc-pcm179x-i2c.o
@@@ -305,7 -298,6 +305,7 @@@ obj-$(CONFIG_SND_SOC_PCM3008)      += snd-so
  obj-$(CONFIG_SND_SOC_PCM3168A)        += snd-soc-pcm3168a.o
  obj-$(CONFIG_SND_SOC_PCM3168A_I2C)    += snd-soc-pcm3168a-i2c.o
  obj-$(CONFIG_SND_SOC_PCM3168A_SPI)    += snd-soc-pcm3168a-spi.o
 +obj-$(CONFIG_SND_SOC_PCM5102A)        += snd-soc-pcm5102a.o
  obj-$(CONFIG_SND_SOC_PCM512x) += snd-soc-pcm512x.o
  obj-$(CONFIG_SND_SOC_PCM512x_I2C)     += snd-soc-pcm512x-i2c.o
  obj-$(CONFIG_SND_SOC_PCM512x_SPI)     += snd-soc-pcm512x-spi.o
@@@ -343,7 -335,6 +343,7 @@@ obj-$(CONFIG_SND_SOC_STI_SAS)      += snd-so
  obj-$(CONFIG_SND_SOC_TAS2552) += snd-soc-tas2552.o
  obj-$(CONFIG_SND_SOC_TAS5086) += snd-soc-tas5086.o
  obj-$(CONFIG_SND_SOC_TAS571X) += snd-soc-tas571x.o
 +obj-$(CONFIG_SND_SOC_TAS5720) += snd-soc-tas5720.o
  obj-$(CONFIG_SND_SOC_TFA9879) += snd-soc-tfa9879.o
  obj-$(CONFIG_SND_SOC_TLV320AIC23)     += snd-soc-tlv320aic23.o
  obj-$(CONFIG_SND_SOC_TLV320AIC23_I2C) += snd-soc-tlv320aic23-i2c.o
@@@ -351,8 -342,6 +351,8 @@@ obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI)      +
  obj-$(CONFIG_SND_SOC_TLV320AIC26)     += snd-soc-tlv320aic26.o
  obj-$(CONFIG_SND_SOC_TLV320AIC31XX)     += snd-soc-tlv320aic31xx.o
  obj-$(CONFIG_SND_SOC_TLV320AIC32X4)     += snd-soc-tlv320aic32x4.o
 +obj-$(CONFIG_SND_SOC_TLV320AIC32X4_I2C)       += snd-soc-tlv320aic32x4-i2c.o
 +obj-$(CONFIG_SND_SOC_TLV320AIC32X4_SPI)       += snd-soc-tlv320aic32x4-spi.o
  obj-$(CONFIG_SND_SOC_TLV320AIC3X)     += snd-soc-tlv320aic3x.o
  obj-$(CONFIG_SND_SOC_TLV320DAC33)     += snd-soc-tlv320dac33.o
  obj-$(CONFIG_SND_SOC_TS3A227E)        += snd-soc-ts3a227e.o