From: Mark Brown <broonie@linaro.org>
Date: Sun, 1 Jun 2014 13:02:07 +0000 (+0100)
Subject: Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=287d414eacaa681413ea89adfa5b3a0d12d2ab1a;p=linux-beck.git

Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-fsl-ssi

Conflicts:
	sound/soc/fsl/Kconfig
---

287d414eacaa681413ea89adfa5b3a0d12d2ab1a
diff --cc sound/soc/fsl/Kconfig
index 2d6281f1e1f4,f26a2dd698b5..e218df9aa638
--- a/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 "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
- 	tristate
+ 	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