Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/atmel', 'asoc/topic...

[cascardo/linux.git] / sound / soc / fsl / Kconfig

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index aa43854..324988d 100644 (file)
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -1,6 +1,16 @@
+config SND_SOC_FSL_SAI
+       tristate
+       select SND_SOC_GENERIC_DMAENGINE_PCM
+
 config SND_SOC_FSL_SSI
        tristate
 
+config SND_SOC_FSL_SPDIF
+       tristate
+
+config SND_SOC_FSL_ESAI
+       tristate
+
 config SND_SOC_FSL_UTILS
        tristate
 
@@ -98,7 +108,7 @@ endif # SND_POWERPC_SOC
 
 menuconfig SND_IMX_SOC
        tristate "SoC Audio for Freescale i.MX CPUs"
-       depends on ARCH_MXC
+       depends on ARCH_MXC || COMPILE_TEST
        help
          Say Y or M if you want to add support for codecs attached to
          the i.MX CPUs.
@@ -109,11 +119,11 @@ config SND_SOC_IMX_SSI
        tristate
 
 config SND_SOC_IMX_PCM_FIQ
-       bool
+       tristate
        select FIQ
 
 config SND_SOC_IMX_PCM_DMA
-       bool
+       tristate
        select SND_SOC_GENERIC_DMAENGINE_PCM
 
 config SND_SOC_IMX_AUDMUX
@@ -175,7 +185,6 @@ config SND_SOC_IMX_WM8962
        select SND_SOC_IMX_PCM_DMA
        select SND_SOC_IMX_AUDMUX
        select SND_SOC_FSL_SSI
-       select SND_SOC_FSL_UTILS
        help
          Say Y if you want to add support for SoC audio on an i.MX board with
          a wm8962 codec.
@@ -187,14 +196,23 @@ config SND_SOC_IMX_SGTL5000
        select SND_SOC_IMX_PCM_DMA
        select SND_SOC_IMX_AUDMUX
        select SND_SOC_FSL_SSI
-       select SND_SOC_FSL_UTILS
        help
          Say Y if you want to add support for SoC audio on an i.MX board with
          a sgtl5000 codec.
 
+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
+         a S/DPDIF.
+
 config SND_SOC_IMX_MC13783
        tristate "SoC Audio support for I.MX boards with mc13783"
-       depends on MFD_MC13783
+       depends on MFD_MC13783 && ARM
        select SND_SOC_IMX_SSI
        select SND_SOC_IMX_AUDMUX
        select SND_SOC_MC13783