diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-04 19:30:01 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-04 19:30:01 +0200 |
| commit | 986a622df307644af14618bee54c901aa74816da (patch) | |
| tree | 6da87812b9120634381e3e3987e115f90bd562e0 /sound/soc/fsl/Kconfig | |
| parent | Linux 3.10 (diff) | |
| parent | ASoC: imx-sgtl5000: return E_PROBE_DEFER if ssi/codec not found (diff) | |
| download | linux-986a622df307644af14618bee54c901aa74816da.tar.xz linux-986a622df307644af14618bee54c901aa74816da.zip | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/soc/fsl/Kconfig')
| -rw-r--r-- | sound/soc/fsl/Kconfig | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 3843a18d4e56..aa438546c912 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -108,18 +108,13 @@ if SND_IMX_SOC config SND_SOC_IMX_SSI tristate -config SND_SOC_IMX_PCM - tristate - config SND_SOC_IMX_PCM_FIQ bool select FIQ - select SND_SOC_IMX_PCM config SND_SOC_IMX_PCM_DMA bool select SND_SOC_GENERIC_DMAENGINE_PCM - select SND_SOC_IMX_PCM config SND_SOC_IMX_AUDMUX tristate @@ -173,6 +168,18 @@ config SND_SOC_EUKREA_TLV320 Enable I2S based access to the TLV320AIC23B codec attached to the SSI interface +config SND_SOC_IMX_WM8962 + tristate "SoC Audio support for i.MX boards with wm8962" + depends on OF && I2C + select SND_SOC_WM8962 + select SND_SOC_IMX_PCM_DMA + select SND_SOC_IMX_AUDMUX + select SND_SOC_FSL_SSI + select SND_SOC_FSL_UTILS + help + Say Y if you want to add support for SoC audio on an i.MX board with + a wm8962 codec. + config SND_SOC_IMX_SGTL5000 tristate "SoC Audio support for i.MX boards with sgtl5000" depends on OF && I2C |