From: Mark Brown <broonie@linaro.org>
Date: Fri, 7 Mar 2014 03:05:07 +0000 (+0800)
Subject: Merge branch 'topic/tlv320aic23' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8db0d35bee8c7ea32591f33bf5aa97df454b3f6d;p=linux-beck.git

Merge branch 'topic/tlv320aic23' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-fsl

Conflicts:
	sound/soc/fsl/Kconfig
---

8db0d35bee8c7ea32591f33bf5aa97df454b3f6d
diff --cc sound/soc/fsl/Kconfig
index c26ff3441f43,19a18a4f133a..269cb7e8164c
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@@ -168,14 -168,12 +168,14 @@@ config SND_SOC_EUKREA_TLV32
  	depends on MACH_EUKREA_MBIMX27_BASEBOARD \
  		|| MACH_EUKREA_MBIMXSD25_BASEBOARD \
  		|| MACH_EUKREA_MBIMXSD35_BASEBOARD \
 -		|| MACH_EUKREA_MBIMXSD51_BASEBOARD
 +		|| MACH_EUKREA_MBIMXSD51_BASEBOARD \
 +		|| (OF && ARM)
  	depends on I2C
- 	select SND_SOC_TLV320AIC23
+ 	select SND_SOC_TLV320AIC23_I2C
 -	select SND_SOC_IMX_PCM_FIQ
  	select SND_SOC_IMX_AUDMUX
  	select SND_SOC_IMX_SSI
 +	select SND_SOC_FSL_SSI
 +	select SND_SOC_IMX_PCM_DMA
  	help
  	  Enable I2S based access to the TLV320AIC23B codec attached
  	  to the SSI interface