Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

diff --combined sound/soc/codecs/Kconfig
index 663840e677663c5b8190545ae90e81b1ece96b64,167a5ce06cdf26d4393cd0225afcc9b2ef515c7e..a5cfa78eb166b6834e54191ea49bfbd350f7d62f
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -12,13 -12,18 +12,18 @@@ config SND_SOC_ALL_CODEC
        tristate "Build all ASoC CODEC drivers"
        select SND_SOC_L3
        select SND_SOC_AC97_CODEC if SND_SOC_AC97_BUS
+       select SND_SOC_AD1836 if SPI_MASTER
+       select SND_SOC_AD1938 if SPI_MASTER
        select SND_SOC_AD1980 if SND_SOC_AC97_BUS
        select SND_SOC_AD73311 if I2C
        select SND_SOC_AK4104 if SPI_MASTER
        select SND_SOC_AK4535 if I2C
        select SND_SOC_CS4270 if I2C
+       select SND_SOC_MAX9877 if I2C
        select SND_SOC_PCM3008
+       select SND_SOC_SPDIF
        select SND_SOC_SSM2602 if I2C
+       select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
        select SND_SOC_TLV320AIC23 if I2C
        select SND_SOC_TLV320AIC26 if SPI_MASTER
        select SND_SOC_TLV320AIC3X if I2C
@@@ -28,16 -33,24 +33,25 @@@
        select SND_SOC_WM8350 if MFD_WM8350
        select SND_SOC_WM8400 if MFD_WM8400
        select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI
+       select SND_SOC_WM8523 if I2C
        select SND_SOC_WM8580 if I2C
 +      select SND_SOC_WM8711 if I2C
        select SND_SOC_WM8728 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8731 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8750 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8753 if SND_SOC_I2C_AND_SPI
+       select SND_SOC_WM8776 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8900 if I2C
        select SND_SOC_WM8903 if I2C
+       select SND_SOC_WM8940 if I2C
+       select SND_SOC_WM8960 if I2C
+       select SND_SOC_WM8961 if I2C
        select SND_SOC_WM8971 if I2C
+       select SND_SOC_WM8974 if I2C
+       select SND_SOC_WM8988 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8990 if I2C
+       select SND_SOC_WM8993 if I2C
+       select SND_SOC_WM9081 if I2C
        select SND_SOC_WM9705 if SND_SOC_AC97_BUS
        select SND_SOC_WM9712 if SND_SOC_AC97_BUS
        select SND_SOC_WM9713 if SND_SOC_AC97_BUS
@@@ -52,11 -65,21 +66,21 @@@
  
            If unsure select "N".
  
+ config SND_SOC_WM_HUBS
+       tristate
+       default y if SND_SOC_WM8993=y
+       default m if SND_SOC_WM8993=m
  
  config SND_SOC_AC97_CODEC
        tristate
        select SND_AC97_CODEC
  
+ config SND_SOC_AD1836
+       tristate
+ 
+ config SND_SOC_AD1938
+       tristate
+ 
  config SND_SOC_AD1980
        tristate
  
@@@ -81,15 -104,24 +105,24 @@@ config SND_SOC_CS4270_VD33_ERRAT
        bool
        depends on SND_SOC_CS4270
  
+ config SND_SOC_CX20442
+       tristate
+ 
  config SND_SOC_L3
         tristate
  
  config SND_SOC_PCM3008
         tristate
  
+ config SND_SOC_SPDIF
+       tristate
+ 
  config SND_SOC_SSM2602
        tristate
  
+ config SND_SOC_STAC9766
+       tristate
+ 
  config SND_SOC_TLV320AIC23
        tristate
  
@@@ -118,12 -150,12 +151,15 @@@ config SND_SOC_WM840
  config SND_SOC_WM8510
        tristate
  
+ config SND_SOC_WM8523
+       tristate
+ 
  config SND_SOC_WM8580
        tristate
  
 +config SND_SOC_WM8711
 +      tristate
 +
  config SND_SOC_WM8728
        tristate
  
@@@ -136,18 -168,42 +172,42 @@@ config SND_SOC_WM875
  config SND_SOC_WM8753
        tristate
  
+ config SND_SOC_WM8776
+       tristate
+ 
  config SND_SOC_WM8900
        tristate
  
  config SND_SOC_WM8903
        tristate
  
+ config SND_SOC_WM8940
+         tristate
+ 
+ config SND_SOC_WM8960
+       tristate
+ 
+ config SND_SOC_WM8961
+       tristate
+ 
  config SND_SOC_WM8971
        tristate
  
+ config SND_SOC_WM8974
+       tristate
+ 
+ config SND_SOC_WM8988
+       tristate
+ 
  config SND_SOC_WM8990
        tristate
  
+ config SND_SOC_WM8993
+       tristate
+ 
+ config SND_SOC_WM9081
+       tristate
+ 
  config SND_SOC_WM9705
        tristate
  
@@@ -156,3 -212,7 +216,7 @@@ config SND_SOC_WM971
  
  config SND_SOC_WM9713
        tristate
+ 
+ # Amp
+ config SND_SOC_MAX9877
+       tristate

diff --combined sound/soc/codecs/Makefile
index 19950e998b6b1ac56a475572a9bb887f06963832,fbab43bbe3a7408daab236e9a294d8d490daba79..711d8f5887de6b6c09c189545bd351688513b6f2
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -1,12 -1,17 +1,17 @@@
  snd-soc-ac97-objs := ac97.o
+ snd-soc-ad1836-objs := ad1836.o
+ snd-soc-ad1938-objs := ad1938.o
  snd-soc-ad1980-objs := ad1980.o
  snd-soc-ad73311-objs := ad73311.o
  snd-soc-ak4104-objs := ak4104.o
  snd-soc-ak4535-objs := ak4535.o
  snd-soc-cs4270-objs := cs4270.o
+ snd-soc-cx20442-objs := cx20442.o
  snd-soc-l3-objs := l3.o
  snd-soc-pcm3008-objs := pcm3008.o
+ snd-soc-spdif-objs := spdif_transciever.o
  snd-soc-ssm2602-objs := ssm2602.o
+ snd-soc-stac9766-objs := stac9766.o
  snd-soc-tlv320aic23-objs := tlv320aic23.o
  snd-soc-tlv320aic26-objs := tlv320aic26.o
  snd-soc-tlv320aic3x-objs := tlv320aic3x.o
@@@ -16,29 -21,46 +21,47 @@@ snd-soc-uda1380-objs := uda1380.
  snd-soc-wm8350-objs := wm8350.o
  snd-soc-wm8400-objs := wm8400.o
  snd-soc-wm8510-objs := wm8510.o
+ snd-soc-wm8523-objs := wm8523.o
  snd-soc-wm8580-objs := wm8580.o
 +snd-soc-wm8711-objs := wm8711.o
  snd-soc-wm8728-objs := wm8728.o
  snd-soc-wm8731-objs := wm8731.o
  snd-soc-wm8750-objs := wm8750.o
  snd-soc-wm8753-objs := wm8753.o
+ snd-soc-wm8776-objs := wm8776.o
  snd-soc-wm8900-objs := wm8900.o
  snd-soc-wm8903-objs := wm8903.o
+ snd-soc-wm8940-objs := wm8940.o
+ snd-soc-wm8960-objs := wm8960.o
+ snd-soc-wm8961-objs := wm8961.o
  snd-soc-wm8971-objs := wm8971.o
+ snd-soc-wm8974-objs := wm8974.o
+ snd-soc-wm8988-objs := wm8988.o
  snd-soc-wm8990-objs := wm8990.o
+ snd-soc-wm8993-objs := wm8993.o
+ snd-soc-wm9081-objs := wm9081.o
  snd-soc-wm9705-objs := wm9705.o
  snd-soc-wm9712-objs := wm9712.o
  snd-soc-wm9713-objs := wm9713.o
+ snd-soc-wm-hubs-objs := wm_hubs.o
+ 
+ # Amp
+ snd-soc-max9877-objs := max9877.o
  
  obj-$(CONFIG_SND_SOC_AC97_CODEC)      += snd-soc-ac97.o
+ obj-$(CONFIG_SND_SOC_AD1836)  += snd-soc-ad1836.o
+ obj-$(CONFIG_SND_SOC_AD1938)  += snd-soc-ad1938.o
  obj-$(CONFIG_SND_SOC_AD1980)  += snd-soc-ad1980.o
  obj-$(CONFIG_SND_SOC_AD73311) += snd-soc-ad73311.o
  obj-$(CONFIG_SND_SOC_AK4104)  += snd-soc-ak4104.o
  obj-$(CONFIG_SND_SOC_AK4535)  += snd-soc-ak4535.o
  obj-$(CONFIG_SND_SOC_CS4270)  += snd-soc-cs4270.o
+ obj-$(CONFIG_SND_SOC_CX20442) += snd-soc-cx20442.o
  obj-$(CONFIG_SND_SOC_L3)      += snd-soc-l3.o
  obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o
+ obj-$(CONFIG_SND_SOC_SPDIF)   += snd-soc-spdif.o
  obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o
+ obj-$(CONFIG_SND_SOC_STAC9766)        += snd-soc-stac9766.o
  obj-$(CONFIG_SND_SOC_TLV320AIC23)     += snd-soc-tlv320aic23.o
  obj-$(CONFIG_SND_SOC_TLV320AIC26)     += snd-soc-tlv320aic26.o
  obj-$(CONFIG_SND_SOC_TLV320AIC3X)     += snd-soc-tlv320aic3x.o
@@@ -48,16 -70,28 +71,29 @@@ obj-$(CONFIG_SND_SOC_UDA1380)      += snd-so
  obj-$(CONFIG_SND_SOC_WM8350)  += snd-soc-wm8350.o
  obj-$(CONFIG_SND_SOC_WM8400)  += snd-soc-wm8400.o
  obj-$(CONFIG_SND_SOC_WM8510)  += snd-soc-wm8510.o
+ obj-$(CONFIG_SND_SOC_WM8523)  += snd-soc-wm8523.o
  obj-$(CONFIG_SND_SOC_WM8580)  += snd-soc-wm8580.o
 +obj-$(CONFIG_SND_SOC_WM8711)  += snd-soc-wm8711.o
  obj-$(CONFIG_SND_SOC_WM8728)  += snd-soc-wm8728.o
  obj-$(CONFIG_SND_SOC_WM8731)  += snd-soc-wm8731.o
  obj-$(CONFIG_SND_SOC_WM8750)  += snd-soc-wm8750.o
  obj-$(CONFIG_SND_SOC_WM8753)  += snd-soc-wm8753.o
+ obj-$(CONFIG_SND_SOC_WM8776)  += snd-soc-wm8776.o
  obj-$(CONFIG_SND_SOC_WM8900)  += snd-soc-wm8900.o
  obj-$(CONFIG_SND_SOC_WM8903)  += snd-soc-wm8903.o
  obj-$(CONFIG_SND_SOC_WM8971)  += snd-soc-wm8971.o
+ obj-$(CONFIG_SND_SOC_WM8974)  += snd-soc-wm8974.o
+ obj-$(CONFIG_SND_SOC_WM8940)  += snd-soc-wm8940.o
+ obj-$(CONFIG_SND_SOC_WM8960)  += snd-soc-wm8960.o
+ obj-$(CONFIG_SND_SOC_WM8961)  += snd-soc-wm8961.o
+ obj-$(CONFIG_SND_SOC_WM8988)  += snd-soc-wm8988.o
  obj-$(CONFIG_SND_SOC_WM8990)  += snd-soc-wm8990.o
+ obj-$(CONFIG_SND_SOC_WM8993)  += snd-soc-wm8993.o
+ obj-$(CONFIG_SND_SOC_WM9081)  += snd-soc-wm9081.o
  obj-$(CONFIG_SND_SOC_WM9705)  += snd-soc-wm9705.o
  obj-$(CONFIG_SND_SOC_WM9712)  += snd-soc-wm9712.o
  obj-$(CONFIG_SND_SOC_WM9713)  += snd-soc-wm9713.o
+ obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o
+ 
+ # Amp
+ obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o