ASoC: fsl-esai: Revert .xlate_tdm_slot_mask() support

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

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 07f8f141727d99c19403f2994ac42ce63ff6f23a..8c79856afee9ad081563b90ef9fc2d23e17eb45e 100644 (file)
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -1,26 +1,89 @@
+menu "SoC Audio for Freescale CPUs"
+
+comment "Common SoC Audio options for Freescale CPUs:"
+
+config SND_SOC_FSL_ASRC
+       tristate "Asynchronous Sample Rate Converter (ASRC) module support"
+       select REGMAP_MMIO
+       select SND_SOC_GENERIC_DMAENGINE_PCM
+       help
+         Say Y if you want to add Asynchronous Sample Rate Converter (ASRC)
+         support for the Freescale CPUs.
+         This option is only useful for out-of-tree drivers since
+         in-tree drivers select it automatically.
+
 config SND_SOC_FSL_SAI
-       tristate
+       tristate "Synchronous Audio Interface (SAI) module support"
+       select REGMAP_MMIO
+       select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
        select SND_SOC_GENERIC_DMAENGINE_PCM
+       help
+         Say Y if you want to add Synchronous Audio Interface (SAI)
+         support for the Freescale CPUs.
+         This option is only useful for out-of-tree drivers since
+         in-tree drivers select it automatically.
 
 config SND_SOC_FSL_SSI
-       tristate
+       tristate "Synchronous Serial Interface module support"
+       select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
+       select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && (MXC_TZIC || MXC_AVIC)
+       select REGMAP_MMIO
+       help
+         Say Y if you want to add Synchronous Serial Interface (SSI)
+         support for the Freescale CPUs.
+         This option is only useful for out-of-tree drivers since
+         in-tree drivers select it automatically.
 
 config SND_SOC_FSL_SPDIF
-       tristate
+       tristate "Sony/Philips Digital Interface module support"
+       select REGMAP_MMIO
+       select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
+       select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && (MXC_TZIC || MXC_AVIC)
+       help
+         Say Y if you want to add Sony/Philips Digital Interface (SPDIF)
+         support for the Freescale CPUs.
+         This option is only useful for out-of-tree drivers since
+         in-tree drivers select it automatically.
 
 config SND_SOC_FSL_ESAI
-       tristate
+       tristate "Enhanced Serial Audio Interface (ESAI) module support"
+       select REGMAP_MMIO
+       select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
+       help
+         Say Y if you want to add Enhanced Synchronous Audio Interface
+         (ESAI) support for the Freescale CPUs.
+         This option is only useful for out-of-tree drivers since
+         in-tree drivers select it automatically.
 
 config SND_SOC_FSL_UTILS
        tristate
 
-menuconfig SND_POWERPC_SOC
+config SND_SOC_IMX_PCM_DMA
+       tristate
+       select SND_SOC_GENERIC_DMAENGINE_PCM
+
+config SND_SOC_IMX_AUDMUX
+       tristate "Digital Audio Mux module support"
+       help
+         Say Y if you want to add Digital Audio Mux (AUDMUX) support
+         for the ARM i.MX CPUs.
+         This option is only useful for out-of-tree drivers since
+         in-tree drivers select it automatically.
+
+config SND_POWERPC_SOC
        tristate "SoC Audio for Freescale PowerPC CPUs"
        depends on FSL_SOC || PPC_MPC52xx
        help
          Say Y or M if you want to add support for codecs attached to
          the PowerPC CPUs.
 
+config SND_IMX_SOC
+       tristate "SoC Audio for Freescale i.MX CPUs"
+       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.
+
 if SND_POWERPC_SOC
 
 config SND_MPC52xx_DMA
@@ -29,6 +92,8 @@ config SND_MPC52xx_DMA
 config SND_SOC_POWERPC_DMA
        tristate
 
+comment "SoC Audio support for Freescale PPC boards:"
+
 config SND_SOC_MPC8610_HPCD
        tristate "ALSA SoC support for the Freescale MPC8610 HPCD board"
        # I2C is necessary for the CS4270 driver
@@ -106,13 +171,6 @@ config SND_MPC52xx_SOC_EFIKA
 
 endif # SND_POWERPC_SOC
 
-menuconfig SND_IMX_SOC
-       tristate "SoC Audio for Freescale i.MX CPUs"
-       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.
-
 if SND_IMX_SOC
 
 config SND_SOC_IMX_SSI
@@ -122,12 +180,7 @@ config SND_SOC_IMX_PCM_FIQ
        tristate
        select FIQ
 
-config SND_SOC_IMX_PCM_DMA
-       tristate
-       select SND_SOC_GENERIC_DMAENGINE_PCM
-
-config SND_SOC_IMX_AUDMUX
-       tristate
+comment "SoC Audio support for Freescale i.MX boards:"
 
 config SND_MXC_SOC_WM1133_EV1
        tristate "Audio on the i.MX31ADS with WM1133-EV1 fitted"
@@ -204,7 +257,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
@@ -219,3 +271,5 @@ config SND_SOC_IMX_MC13783
        select SND_SOC_IMX_PCM_DMA
 
 endif # SND_IMX_SOC
+
+endmenu