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

diff --combined sound/soc/codecs/Kconfig
index cf7b989,86b3524..2f45f00
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -26,7 -26,6 +26,7 @@@ config SND_SOC_ALL_CODEC
        select SND_SOC_AK4641 if I2C
        select SND_SOC_AK4642 if I2C
        select SND_SOC_AK4671 if I2C
 +      select SND_SOC_AK5386
        select SND_SOC_ALC5623 if I2C
        select SND_SOC_ALC5632 if I2C
        select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
@@@ -64,6 -63,7 +64,7 @@@
        select SND_SOC_STA32X if I2C
        select SND_SOC_STA529 if I2C
        select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
+       select SND_SOC_TAS5086 if I2C
        select SND_SOC_TLV320AIC23 if I2C
        select SND_SOC_TLV320AIC26 if SPI_MASTER
        select SND_SOC_TLV320AIC32X4 if I2C
@@@ -204,9 -204,6 +205,9 @@@ config SND_SOC_AK464
  config SND_SOC_AK4671
        tristate
  
 +config SND_SOC_AK5386
 +      tristate
 +
  config SND_SOC_ALC5623
         tristate
  config SND_SOC_ALC5632
@@@ -324,11 -321,14 +325,14 @@@ config SND_SOC_STA52
  config SND_SOC_STAC9766
        tristate
  
+ config SND_SOC_TAS5086
+       tristate
+ 
  config SND_SOC_TLV320AIC23
        tristate
  
  config SND_SOC_TLV320AIC26
 -      tristate "TI TLV320AIC26 Codec support" if SND_SOC_OF_SIMPLE
 +      tristate
        depends on SPI
  
  config SND_SOC_TLV320AIC32X4

diff --combined sound/soc/codecs/Makefile
index 3a7ec1c,8077bc2..b9e41c9
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -14,7 -14,6 +14,7 @@@ snd-soc-ak4535-objs := ak4535.
  snd-soc-ak4641-objs := ak4641.o
  snd-soc-ak4642-objs := ak4642.o
  snd-soc-ak4671-objs := ak4671.o
 +snd-soc-ak5386-objs := ak5386.o
  snd-soc-arizona-objs := arizona.o
  snd-soc-cq93vc-objs := cq93vc.o
  snd-soc-cs42l51-objs := cs42l51.o
@@@ -56,6 -55,7 +56,7 @@@ snd-soc-ssm2602-objs := ssm2602.
  snd-soc-sta32x-objs := sta32x.o
  snd-soc-sta529-objs := sta529.o
  snd-soc-stac9766-objs := stac9766.o
+ snd-soc-tas5086-objs := tas5086.o
  snd-soc-tlv320aic23-objs := tlv320aic23.o
  snd-soc-tlv320aic26-objs := tlv320aic26.o
  snd-soc-tlv320aic3x-objs := tlv320aic3x.o
@@@ -138,7 -138,6 +139,7 @@@ obj-$(CONFIG_SND_SOC_AK4535)       += snd-soc
  obj-$(CONFIG_SND_SOC_AK4641)  += snd-soc-ak4641.o
  obj-$(CONFIG_SND_SOC_AK4642)  += snd-soc-ak4642.o
  obj-$(CONFIG_SND_SOC_AK4671)  += snd-soc-ak4671.o
 +obj-$(CONFIG_SND_SOC_AK5386)  += snd-soc-ak5386.o
  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
@@@ -179,6 -178,7 +180,7 @@@ obj-$(CONFIG_SND_SOC_SSM2602)      += snd-so
  obj-$(CONFIG_SND_SOC_STA32X)   += snd-soc-sta32x.o
  obj-$(CONFIG_SND_SOC_STA529)   += snd-soc-sta529.o
  obj-$(CONFIG_SND_SOC_STAC9766)        += snd-soc-stac9766.o
+ obj-$(CONFIG_SND_SOC_TAS5086) += snd-soc-tas5086.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