1 files changed, 58 insertions, 19 deletions

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 338a91642471..d262ec0653d3 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -1,30 +1,77 @@
+menu "SoC Audio for Freescale CPUs"
+
+comment "Common SoC Audio options for Freescale CPUs:"
+
 config SND_SOC_FSL_SAI
-        tristate
+        tristate "Synchronous Audio Interface (SAI) module support"
         select REGMAP_MMIO
         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 && ARCH_MXC
+        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 && ARCH_MXC
+        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_FSL_UTILS
+        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
@@ -33,6 +80,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
@@ -110,13 +159,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
@@ -127,12 +169,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"
@@ -187,7 +224,7 @@ config SND_SOC_EUKREA_TLV320
 
 config SND_SOC_IMX_WM8962
         tristate "SoC Audio support for i.MX boards with wm8962"
-        depends on OF && I2C
+        depends on OF && I2C && INPUT
         select SND_SOC_WM8962
         select SND_SOC_IMX_PCM_DMA
         select SND_SOC_IMX_AUDMUX
@@ -225,3 +262,5 @@ config SND_SOC_IMX_MC13783
         select SND_SOC_IMX_PCM_DMA
 
 endif # SND_IMX_SOC
+
+endmenu