Merge remote-tracking branches 'asoc/topic/tlv320aic32x4', 'asoc/topic/tlv320aic3x...

diff --combined sound/soc/codecs/Kconfig
index 4e984e1,a68d173,a68d173,a68d173,243ec86,a68d173..883c577
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
--- 3/sound/soc/codecs/Kconfig
--- 4/sound/soc/codecs/Kconfig
--- 5/sound/soc/codecs/Kconfig
--- 6/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@@@ -50,8 -50,7 -50,7 -50,7 -50,7 -50,7 +50,8 @@@@@@@ config SND_SOC_ALL_CODEC
        select SND_SOC_CS42L73 if I2C
        select SND_SOC_CS4265 if I2C
        select SND_SOC_CS4270 if I2C
 -----  select SND_SOC_CS4271 if SND_SOC_I2C_AND_SPI
 +++++  select SND_SOC_CS4271_I2C if I2C
 +++++  select SND_SOC_CS4271_SPI if SPI_MASTER
        select SND_SOC_CS42XX8_I2C if I2C
        select SND_SOC_CX20442 if TTY
        select SND_SOC_DA7210 if I2C
@@@@@@@ -86,7 -85,7 -85,7 -85,7 -85,7 -85,7 +86,7 @@@@@@@
        select SND_SOC_RT5645 if I2C
        select SND_SOC_RT5651 if I2C
        select SND_SOC_RT5670 if I2C
 -----  select SND_SOC_RT5677 if I2C
 +++++  select SND_SOC_RT5677 if I2C && SPI_MASTER
        select SND_SOC_SGTL5000 if I2C
        select SND_SOC_SI476X if MFD_SI476X_CORE
        select SND_SOC_SIRF_AUDIO_CODEC
@@@@@@@ -102,7 -101,6 -101,6 -101,6 -101,6 -101,6 +102,7 @@@@@@@
        select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
        select SND_SOC_TAS2552 if I2C
        select SND_SOC_TAS5086 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
@@@@@@@ -111,6 -109,6 -109,6 -109,6 -109,7 -109,6 +111,7 @@@@@@@
        select SND_SOC_TLV320AIC3X if I2C
        select SND_SOC_TPA6130A2 if I2C
        select SND_SOC_TLV320DAC33 if I2C
++++ +  select SND_SOC_TS3A227E if I2C
        select SND_SOC_TWL4030 if TWL4030_CORE
        select SND_SOC_TWL6040 if TWL6040_CORE
        select SND_SOC_UDA134X
@@@@@@@ -225,7 -223,6 -223,6 -223,6 -224,6 -223,6 +226,7 @@@@@@@ config SND_SOC_AD193X_I2
        select SND_SOC_AD193X
      
      config SND_SOC_AD1980
 +++++  select REGMAP_AC97
        tristate
      
      config SND_SOC_AD73311
@@@@@@@ -339,8 -336,7 -336,7 -336,7 -337,7 -336,7 +340,8 @@@@@@@ config SND_SOC_CS42L5
        tristate
      
      config SND_SOC_CS42L51_I2C
 -----  tristate
 +++++  tristate "Cirrus Logic CS42L51 CODEC (I2C)"
 +++++  depends on I2C
        select SND_SOC_CS42L51
      
      config SND_SOC_CS42L52
@@@@@@@ -374,19 -370,8 -370,8 -370,8 -371,8 -370,8 +375,19 @@@@@@@ config SND_SOC_CS4270_VD33_ERRAT
        depends on SND_SOC_CS4270
      
      config SND_SOC_CS4271
 -----  tristate "Cirrus Logic CS4271 CODEC"
 -----  depends on SND_SOC_I2C_AND_SPI
 +++++  tristate
 +++++
 +++++config SND_SOC_CS4271_I2C
 +++++  tristate "Cirrus Logic CS4271 CODEC (I2C)"
 +++++  depends on I2C
 +++++  select SND_SOC_CS4271
 +++++  select REGMAP_I2C
 +++++
 +++++config SND_SOC_CS4271_SPI
 +++++  tristate "Cirrus Logic CS4271 CODEC (SPI)"
 +++++  depends on SPI_MASTER
 +++++  select SND_SOC_CS4271
 +++++  select REGMAP_SPI
      
      config SND_SOC_CS42XX8
        tristate
@@@@@@@ -502,8 -487,7 -487,7 -487,7 -488,7 -487,7 +503,8 @@@@@@@ config SND_SOC_RT28
        depends on I2C
      
      config SND_SOC_RT5631
 -----  tristate
 +++++  tristate "Realtek ALC5631/RT5631 CODEC"
 +++++  depends on I2C
      
      config SND_SOC_RT5640
        tristate
@@@@@@@ -520,10 -504,6 -504,6 -504,6 -505,6 -504,6 +521,10 @@@@@@@ config SND_SOC_RT567
      config SND_SOC_RT5677
        tristate
      
 +++++config SND_SOC_RT5677_SPI
 +++++  tristate
 +++++  default SND_SOC_RT5677
 +++++
      #Freescale sgtl5000 codec
      config SND_SOC_SGTL5000
        tristate "Freescale SGTL5000 CODEC"
@@@@@@@ -597,21 -577,15 -577,15 -577,15 -578,15 -577,15 +598,21 @@@@@@@ config SND_SOC_TAS508
        tristate "Texas Instruments TAS5086 speaker amplifier"
        depends on I2C
      
 +++++config SND_SOC_TFA9879
 +++++  tristate "NXP Semiconductors TFA9879 amplifier"
 +++++  depends on I2C
 +++++
      config SND_SOC_TLV320AIC23
        tristate
      
      config SND_SOC_TLV320AIC23_I2C
 -----  tristate
 +++++  tristate "Texas Instruments TLV320AIC23 audio CODEC - I2C"
 +++++  depends on I2C
        select SND_SOC_TLV320AIC23
      
      config SND_SOC_TLV320AIC23_SPI
 -----  tristate
 +++++  tristate "Texas Instruments TLV320AIC23 audio CODEC - SPI"
 +++++  depends on SPI_MASTER
        select SND_SOC_TLV320AIC23
      
      config SND_SOC_TLV320AIC26
@@@@@@@ -633,6 -607,6 -607,6 -607,6 -608,10 -607,6 +634,10 @@@@@@@ config SND_SOC_TLV320AIC3
      config SND_SOC_TLV320DAC33
        tristate
      
++++ +config SND_SOC_TS3A227E
++++ +  tristate "TI Headset/Mic detect and keypress chip"
++++ +  depends on I2C
++++ +
      config SND_SOC_TWL4030
        select MFD_TWL4030_AUDIO
        tristate

diff --combined sound/soc/codecs/Makefile
index c94b5a8,5dce451,5dce451,5dce451,a1eb7ef,5dce451..bbdfd1e
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
--- 3/sound/soc/codecs/Makefile
--- 4/sound/soc/codecs/Makefile
--- 5/sound/soc/codecs/Makefile
--- 6/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@@@@@ -41,8 -41,6 -41,6 -41,6 -41,6 -41,6 +41,8 @@@@@@@ snd-soc-cs42l73-objs := cs42l73.
      snd-soc-cs4265-objs := cs4265.o
      snd-soc-cs4270-objs := cs4270.o
      snd-soc-cs4271-objs := cs4271.o
 +++++snd-soc-cs4271-i2c-objs := cs4271-i2c.o
 +++++snd-soc-cs4271-spi-objs := cs4271-spi.o
      snd-soc-cs42xx8-objs := cs42xx8.o
      snd-soc-cs42xx8-i2c-objs := cs42xx8-i2c.o
      snd-soc-cx20442-objs := cx20442.o
@@@@@@@ -82,7 -80,6 -80,6 -80,6 -80,6 -80,6 +82,7 @@@@@@@ snd-soc-rt5645-objs := rt5645.
      snd-soc-rt5651-objs := rt5651.o
      snd-soc-rt5670-objs := rt5670.o
      snd-soc-rt5677-objs := rt5677.o
 +++++snd-soc-rt5677-spi-objs := rt5677-spi.o
      snd-soc-sgtl5000-objs := sgtl5000.o
      snd-soc-alc5623-objs := alc5623.o
      snd-soc-alc5632-objs := alc5632.o
@@@@@@@ -104,7 -101,6 -101,6 -101,6 -101,6 -101,6 +104,7 @@@@@@@ snd-soc-sta350-objs := sta350.
      snd-soc-sta529-objs := sta529.o
      snd-soc-stac9766-objs := stac9766.o
      snd-soc-tas5086-objs := tas5086.o
 +++++snd-soc-tfa9879-objs := tfa9879.o
      snd-soc-tlv320aic23-objs := tlv320aic23.o
      snd-soc-tlv320aic23-i2c-objs := tlv320aic23-i2c.o
      snd-soc-tlv320aic23-spi-objs := tlv320aic23-spi.o
@@@@@@@ -113,6 -109,6 -109,6 -109,6 -109,7 -109,6 +113,7 @@@@@@@ snd-soc-tlv320aic31xx-objs := tlv320aic
      snd-soc-tlv320aic32x4-objs := tlv320aic32x4.o
      snd-soc-tlv320aic3x-objs := tlv320aic3x.o
      snd-soc-tlv320dac33-objs := tlv320dac33.o
++++ +snd-soc-ts3a227e-objs := ts3a227e.o
      snd-soc-twl4030-objs := twl4030.o
      snd-soc-twl6040-objs := twl6040.o
      snd-soc-uda134x-objs := uda134x.o
@@@@@@@ -221,8 -217,6 -217,6 -217,6 -218,6 -217,6 +222,8 @@@@@@@ obj-$(CONFIG_SND_SOC_CS42L73)  += snd-so
      obj-$(CONFIG_SND_SOC_CS4265)      += snd-soc-cs4265.o
      obj-$(CONFIG_SND_SOC_CS4270)      += snd-soc-cs4270.o
      obj-$(CONFIG_SND_SOC_CS4271)      += snd-soc-cs4271.o
 +++++obj-$(CONFIG_SND_SOC_CS4271_I2C)  += snd-soc-cs4271-i2c.o
 +++++obj-$(CONFIG_SND_SOC_CS4271_SPI)  += snd-soc-cs4271-spi.o
      obj-$(CONFIG_SND_SOC_CS42XX8)     += snd-soc-cs42xx8.o
      obj-$(CONFIG_SND_SOC_CS42XX8_I2C) += snd-soc-cs42xx8-i2c.o
      obj-$(CONFIG_SND_SOC_CX20442)     += snd-soc-cx20442.o
@@@@@@@ -262,7 -256,6 -256,6 -256,6 -257,6 -256,6 +263,7 @@@@@@@ obj-$(CONFIG_SND_SOC_RT5645)   += snd-soc
      obj-$(CONFIG_SND_SOC_RT5651)      += snd-soc-rt5651.o
      obj-$(CONFIG_SND_SOC_RT5670)      += snd-soc-rt5670.o
      obj-$(CONFIG_SND_SOC_RT5677)      += snd-soc-rt5677.o
 +++++obj-$(CONFIG_SND_SOC_RT5677_SPI)  += snd-soc-rt5677-spi.o
      obj-$(CONFIG_SND_SOC_SGTL5000)  += snd-soc-sgtl5000.o
      obj-$(CONFIG_SND_SOC_SIGMADSP)    += snd-soc-sigmadsp.o
      obj-$(CONFIG_SND_SOC_SIGMADSP_I2C)        += snd-soc-sigmadsp-i2c.o
@@@@@@@ -281,7 -274,6 -274,6 -274,6 -275,6 -274,6 +282,7 @@@@@@@ obj-$(CONFIG_SND_SOC_STA529)   += snd-s
      obj-$(CONFIG_SND_SOC_STAC9766)    += snd-soc-stac9766.o
      obj-$(CONFIG_SND_SOC_TAS2552)     += snd-soc-tas2552.o
      obj-$(CONFIG_SND_SOC_TAS5086)     += snd-soc-tas5086.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
      obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI)     += snd-soc-tlv320aic23-spi.o
@@@@@@@ -290,6 -282,6 -282,6 -282,6 -283,7 -282,6 +291,7 @@@@@@@ obj-$(CONFIG_SND_SOC_TLV320AIC31XX
      obj-$(CONFIG_SND_SOC_TLV320AIC32X4)     += snd-soc-tlv320aic32x4.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
      obj-$(CONFIG_SND_SOC_TWL4030)     += snd-soc-twl4030.o
      obj-$(CONFIG_SND_SOC_TWL6040)     += snd-soc-twl6040.o
      obj-$(CONFIG_SND_SOC_UDA134X)     += snd-soc-uda134x.o