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

Conflicts:
	sound/soc/fsl/Kconfig

diff --cc sound/soc/fsl/Kconfig
index 2d6281f1e1f42d2567568f01f89a28b40267f9a7,f26a2dd698b53e6083069132972ddf10b4a39f3f..e218df9aa638416533900ba38b9916b0dff0264e
--- 1/sound/soc/fsl/Kconfig
--- 2/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@@ -1,20 -1,47 +1,48 @@@
+ 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
 +      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 && 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

diff --cc sound/soc/fsl/fsl_ssi.c
Simple merge