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

Conflicts:
	sound/soc/fsl/Kconfig

diff --cc sound/soc/fsl/Kconfig
index c26ff3441f4376b8792a200cb393ffe3982c92dc,19a18a4f133ae61714bf29f8a21f50e51a688412..269cb7e8164cc5301683785d695be920b744d397
--- 1/sound/soc/fsl/Kconfig
--- 2/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