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

diff --combined sound/soc/codecs/Kconfig
index b54ed6e,d764f13..f22e86e
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -79,6 -79,7 +79,7 @@@ config SND_SOC_ALL_CODEC
        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
@@@ -88,14 -89,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
@@@ -131,8 -130,7 +132,8 @@@
        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
@@@ -480,11 -478,6 +481,11 @@@ config SND_SOC_BT_SC
  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"
  
@@@ -530,6 -523,9 +531,9 @@@ config SND_SOC_MAX9809
  config SND_SOC_MAX98357A
         tristate
  
+ config SND_SOC_MAX98371
+        tristate
+ 
  config SND_SOC_MAX9867
        tristate
  
@@@ -583,9 -579,6 +587,9 @@@ config SND_SOC_PCM3168A_SP
        select SND_SOC_PCM3168A
        select REGMAP_SPI
  
 +config SND_SOC_PCM5102A
 +      tristate
 +
  config SND_SOC_PCM512x
        tristate
  
@@@ -640,7 -633,6 +644,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"
@@@ -781,16 -773,6 +785,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 41ce67b,92ef871..a2fdfdc
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -74,6 -74,7 +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
@@@ -81,7 -82,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
@@@ -90,7 -90,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
@@@ -138,8 -137,6 +139,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
@@@ -294,7 -291,6 +295,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
@@@ -303,7 -299,6 +304,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
@@@ -348,8 -343,6 +349,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