diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:27 (GMT) |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:27 (GMT) |
commit | ac97d4e00a8356e61806fe7b223c0b7021908577 (patch) | |
tree | fb20da2e2689ff1f20cd39d9d11de66be6069461 /sound/soc/davinci/Kconfig | |
parent | 1d697db0ab270ec8eff4021926283fa552790e6d (diff) | |
parent | ee2f615d6e59cea2b9a415661a7f27caffcb3528 (diff) | |
download | linux-fsl-qoriq-ac97d4e00a8356e61806fe7b223c0b7021908577.tar.xz |
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
Diffstat (limited to 'sound/soc/davinci/Kconfig')
-rw-r--r-- | sound/soc/davinci/Kconfig | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig index c82f89c..95970f5 100644 --- a/sound/soc/davinci/Kconfig +++ b/sound/soc/davinci/Kconfig @@ -1,9 +1,10 @@ config SND_DAVINCI_SOC - tristate "SoC Audio for the TI DAVINCI chip" - depends on ARCH_DAVINCI + tristate "SoC Audio for the TI DAVINCI or AM33XX chip" + depends on ARCH_DAVINCI || SOC_AM33XX help + Platform driver for daVinci or AM33xx Say Y or M if you want to add support for codecs attached to - the DAVINCI AC97 or I2S interface. You will also need + the DAVINCI AC97, I2S, or McASP interface. You will also need to select the audio interfaces to support below. config SND_DAVINCI_SOC_I2S @@ -15,6 +16,17 @@ config SND_DAVINCI_SOC_MCASP config SND_DAVINCI_SOC_VCIF tristate +config SND_AM33XX_SOC_EVM + tristate "SoC Audio for the AM33XX chip based boards" + depends on SND_DAVINCI_SOC && SOC_AM33XX + select SND_SOC_TLV320AIC3X + select SND_DAVINCI_SOC_MCASP + help + Say Y or M if you want to add support for SoC audio on AM33XX + boards using McASP and TLV320AIC3X codec. For example AM335X-EVM, + AM335X-EVMSK, and BeagelBone with AudioCape boards have this + setup. + config SND_DAVINCI_SOC_EVM tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM" depends on SND_DAVINCI_SOC |