Merge remote-tracking branches 'asoc/topic/da7213', 'asoc/topic/da732x', 'asoc/topic...

[karo-tx-linux.git] / sound / soc / fsl / Kconfig

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 324988dea4bd31bd8ad8f6d416c701c2f874966f..597962ec28fa9ffed74714cee6a36df883954105 100644 (file)
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -1,5 +1,6 @@
 config SND_SOC_FSL_SAI
        tristate
+       select REGMAP_MMIO
        select SND_SOC_GENERIC_DMAENGINE_PCM
 
 config SND_SOC_FSL_SSI
@@ -7,9 +8,11 @@ config SND_SOC_FSL_SSI
 
 config SND_SOC_FSL_SPDIF
        tristate
+       select REGMAP_MMIO
 
 config SND_SOC_FSL_ESAI
        tristate
+       select REGMAP_MMIO
 
 config SND_SOC_FSL_UTILS
        tristate
@@ -168,12 +171,14 @@ config SND_SOC_EUKREA_TLV320
        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_IMX_PCM_FIQ
+       select SND_SOC_TLV320AIC23_I2C
        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
@@ -204,7 +209,6 @@ config SND_SOC_IMX_SPDIF
        tristate "SoC Audio support for i.MX boards with S/PDIF"
        select SND_SOC_IMX_PCM_DMA
        select SND_SOC_FSL_SPDIF
-       select REGMAP_MMIO
        help
          SoC Audio support for i.MX boards with S/PDIF
          Say Y if you want to add support for SoC audio on an i.MX board with
@@ -212,7 +216,7 @@ config SND_SOC_IMX_SPDIF
 
 config SND_SOC_IMX_MC13783
        tristate "SoC Audio support for I.MX boards with mc13783"
-       depends on MFD_MC13783 && ARM
+       depends on MFD_MC13XXX && ARM
        select SND_SOC_IMX_SSI
        select SND_SOC_IMX_AUDMUX
        select SND_SOC_MC13783