diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-07 18:38:56 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-07 18:38:56 +0200 |
| commit | 9eb34302681d3f6cf0b186aae31ba08cbd5f22fb (patch) | |
| tree | 4cae22049ea71aa548c885671fe252d1bd8248fe /sound/soc/imx/Kconfig | |
| parent | 9d7db2b2cb507f31ff29e339e9ed2f825edb555d (diff) | |
| parent | 04c09a15f5c3a1f468cb8daf570eec3af21940ed (diff) | |
| download | kernel_goldelico_gta04-9eb34302681d3f6cf0b186aae31ba08cbd5f22fb.zip kernel_goldelico_gta04-9eb34302681d3f6cf0b186aae31ba08cbd5f22fb.tar.gz kernel_goldelico_gta04-9eb34302681d3f6cf0b186aae31ba08cbd5f22fb.tar.bz2 | |
Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'sound/soc/imx/Kconfig')
| -rw-r--r-- | sound/soc/imx/Kconfig | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig index eba9b9d..079b23b 100644 --- a/sound/soc/imx/Kconfig +++ b/sound/soc/imx/Kconfig @@ -13,9 +13,27 @@ config SND_MXC_SOC_SSI config SND_MXC_SOC_WM1133_EV1 tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted" - depends on SND_IMX_SOC && EXPERIMENTAL + depends on SND_IMX_SOC && MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL select SND_SOC_WM8350 select SND_MXC_SOC_SSI help Enable support for audio on the i.MX31ADS with the WM1133-EV1 PMIC board with WM8835x fitted. + +config SND_SOC_PHYCORE_AC97 + tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards" + depends on MACH_PCM043 || MACH_PCA100 + select SND_MXC_SOC_SSI + select SND_SOC_WM9712 + help + Say Y if you want to add support for SoC audio on Phytec phyCORE + and phyCARD boards in AC97 mode + +config SND_SOC_EUKREA_TLV320 + bool "Eukrea TLV320" + depends on MACH_EUKREA_MBIMX27_BASEBOARD + select SND_IMX_SOC + select SND_SOC_TLV320AIC23 + help + Enable I2S based access to the TLV320AIC23B codec attached + to the SSI4 interface |