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

1 files changed, 29 insertions, 0 deletions

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index f3012b645b51..6164e78b466a 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -240,6 +240,18 @@ config SND_SOC_IMX_WM8962
           Say Y if you want to add support for SoC audio on an i.MX board with
           a wm8962 codec.
 
+config SND_SOC_IMX_ES8328
+        tristate "SoC Audio support for i.MX boards with the ES8328 codec"
+        depends on OF && (I2C || SPI)
+        select SND_SOC_ES8328_I2C if I2C
+        select SND_SOC_ES8328_SPI if SPI_MASTER
+        select SND_SOC_IMX_PCM_DMA
+        select SND_SOC_IMX_AUDMUX
+        select SND_SOC_FSL_SSI
+        help
+          Say Y if you want to add support for the ES8328 audio codec connected
+          via SSI/I2S over either SPI or I2C.
+
 config SND_SOC_IMX_SGTL5000
         tristate "SoC Audio support for i.MX boards with sgtl5000"
         depends on OF && I2C
@@ -268,6 +280,23 @@ config SND_SOC_IMX_MC13783
         select SND_SOC_MC13783
         select SND_SOC_IMX_PCM_DMA
 
+config SND_SOC_FSL_ASOC_CARD
+        tristate "Generic ASoC Sound Card with ASRC support"
+        depends on OF && I2C
+        select SND_SOC_IMX_AUDMUX
+        select SND_SOC_IMX_PCM_DMA
+        select SND_SOC_FSL_ESAI
+        select SND_SOC_FSL_SAI
+        select SND_SOC_FSL_SSI
+        select SND_SOC_CS42XX8_I2C
+        select SND_SOC_SGTL5000
+        select SND_SOC_WM8962
+        help
+         ALSA SoC Audio support with ASRC feature for Freescale SoCs that have
+         ESAI/SAI/SSI and connect with external CODECs such as WM8962, CS42888
+         and SGTL5000.
+         Say Y if you want to add support for Freescale Generic ASoC Sound Card.
+
 endif # SND_IMX_SOC
 
 endmenu