Merge branches 'topic/ad193x', 'topic/tlv320aic23', 'topic/tlv320aic32x4', 'topic...

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/codecs/Kconfig
Simple merge

diff --cc sound/soc/codecs/Makefile
index bc126764a44d02cb38b50f3ae74900a9ce490da2,7795e37d313f3f0fdbfeda9324b29bbde75573f3,ed1fd8925e43985e368ef6138104e93fc4085578,1deeb20fd41100c5275eada455537276570b75c7,bc126764a44d02cb38b50f3ae74900a9ce490da2,bc126764a44d02cb38b50f3ae74900a9ce490da2,bc126764a44d02cb38b50f3ae74900a9ce490da2..bfda5c60932a35a22ebc9ea7a8f01f5d491f1dd2
--- 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
--- 7/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@@@@@@ -63,9 -65,9 -63,11 -63,9 -63,9 -63,9 -63,9 +65,11 @@@@@@@@ snd-soc-sta529-objs := sta529.
       snd-soc-stac9766-objs := stac9766.o
       snd-soc-tas5086-objs := tas5086.o
       snd-soc-tlv320aic23-objs := tlv320aic23.o
++ ++++snd-soc-tlv320aic23-i2c-objs := tlv320aic23-i2c.o
++ ++++snd-soc-tlv320aic23-spi-objs := tlv320aic23-spi.o
       snd-soc-tlv320aic26-objs := tlv320aic26.o
--- ---snd-soc-tlv320aic3x-objs := tlv320aic3x.o
       snd-soc-tlv320aic32x4-objs := tlv320aic32x4.o
+++ +++snd-soc-tlv320aic3x-objs := tlv320aic3x.o
       snd-soc-tlv320dac33-objs := tlv320dac33.o
       snd-soc-twl4030-objs := twl4030.o
       snd-soc-twl6040-objs := twl6040.o
@@@@@@@@ -193,9 -197,9 -195,11 -193,9 -193,9 -193,9 -193,9 +199,11 @@@@@@@@ obj-$(CONFIG_SND_SOC_STA529)   += snd-s
       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_TLV320AIC23_I2C)    += snd-soc-tlv320aic23-i2c.o
++ ++++obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI)    += snd-soc-tlv320aic23-spi.o
       obj-$(CONFIG_SND_SOC_TLV320AIC26)        += snd-soc-tlv320aic26.o
--- ---obj-$(CONFIG_SND_SOC_TLV320AIC3X)        += snd-soc-tlv320aic3x.o
       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_TWL4030)    += snd-soc-twl4030.o
       obj-$(CONFIG_SND_SOC_TWL6040)    += snd-soc-twl6040.o

diff --cc sound/soc/soc-core.c
Simple merge