diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-31 12:16:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-31 12:16:31 +0200 |
| commit | 9ddd84f872898373c51469f9c931d5aa89fdc807 (patch) | |
| tree | d81f9e396801f04d55924c0d3bbd903fe60ebcda /sound/soc/fsl/Kconfig | |
| parent | 749d32237bf39e6576dd95bfdf24e4378e51716c (diff) | |
| parent | a4b7f21d7b42b33609df3f86992a8deff80abfaf (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/fsl/Kconfig')
| -rw-r--r-- | sound/soc/fsl/Kconfig | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 07f8f141727d..597962ec28fa 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -1,5 +1,6 @@ config SND_SOC_FSL_SAI tristate + select REGMAP_MMIO select SND_SOC_GENERIC_DMAENGINE_PCM config SND_SOC_FSL_SSI @@ -7,9 +8,11 @@ config SND_SOC_FSL_SSI config SND_SOC_FSL_SPDIF tristate + select REGMAP_MMIO config SND_SOC_FSL_ESAI tristate + select REGMAP_MMIO config SND_SOC_FSL_UTILS tristate @@ -168,12 +171,14 @@ config SND_SOC_EUKREA_TLV320 depends on MACH_EUKREA_MBIMX27_BASEBOARD \ || MACH_EUKREA_MBIMXSD25_BASEBOARD \ || MACH_EUKREA_MBIMXSD35_BASEBOARD \ - || MACH_EUKREA_MBIMXSD51_BASEBOARD + || MACH_EUKREA_MBIMXSD51_BASEBOARD \ + || (OF && ARM) depends on I2C - select SND_SOC_TLV320AIC23 - select SND_SOC_IMX_PCM_FIQ + select SND_SOC_TLV320AIC23_I2C select SND_SOC_IMX_AUDMUX select SND_SOC_IMX_SSI + select SND_SOC_FSL_SSI + select SND_SOC_IMX_PCM_DMA help Enable I2S based access to the TLV320AIC23B codec attached to the SSI interface @@ -204,7 +209,6 @@ config SND_SOC_IMX_SPDIF tristate "SoC Audio support for i.MX boards with S/PDIF" select SND_SOC_IMX_PCM_DMA select SND_SOC_FSL_SPDIF - select REGMAP_MMIO help SoC Audio support for i.MX boards with S/PDIF Say Y if you want to add support for SoC audio on an i.MX board with |