From: Mark Brown <broonie@linaro.org>
Date: Thu, 13 Mar 2014 14:19:54 +0000 (+0000)
Subject: Merge remote-tracking branch 'asoc/topic/tlv320aic31xx' into asoc-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=56fe48976db38ed3984e0e68b71e503e8179dd89;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

56fe48976db38ed3984e0e68b71e503e8179dd89
diff --cc sound/soc/codecs/Kconfig
index 32d7a6f04b7d,66f6c53ea328..1a8ff1e541ef
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -82,9 -71,9 +82,10 @@@ config SND_SOC_ALL_CODEC
  	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_TLV320AIC23_I2C if I2C
 +	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_TLV320AIC3X if I2C
  	select SND_SOC_TPA6130A2 if I2C
diff --cc sound/soc/codecs/Makefile
index cb46c4c78dc2,ff1775c562fe..73df822885de
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -76,9 -63,8 +76,10 @@@ 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-tlv320aic31xx-objs := tlv320aic31xx.o
  snd-soc-tlv320aic32x4-objs := tlv320aic32x4.o
  snd-soc-tlv320aic3x-objs := tlv320aic3x.o
  snd-soc-tlv320dac33-objs := tlv320dac33.o
@@@ -220,9 -194,8 +221,10 @@@ 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_TLV320AIC31XX)     += snd-soc-tlv320aic31xx.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