diff options
author | Hebbar, Gururaja <gururaja.hebbar@ti.com> | 2013-10-23 08:30:13 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-23 11:39:33 -0400 |
commit | d79e07c95d1328773509c69131e5f25cac5dbf50 (patch) | |
tree | c5658b8ec0c7cc2963764c51f85290732dcc967a /sound/soc/davinci | |
parent | 1427e660b49e87cd842dba94158b0fc73030c17e (diff) |
ASoC: davinci: Add support for AM33xx SoC Audio
AM33xx uses same McASP IP as the Davinci Platform. This patch updates
Kconfig and makefile to enable build for McASP, PCM & Codec drivers.
Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/davinci')
-rw-r--r-- | sound/soc/davinci/Kconfig | 18 | ||||
-rw-r--r-- | sound/soc/davinci/Makefile | 1 |
2 files changed, 16 insertions, 3 deletions
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig index c82f89c9475b..95970f5db3ec 100644 --- a/sound/soc/davinci/Kconfig +++ b/sound/soc/davinci/Kconfig | |||
@@ -1,9 +1,10 @@ | |||
1 | config SND_DAVINCI_SOC | 1 | config SND_DAVINCI_SOC |
2 | tristate "SoC Audio for the TI DAVINCI chip" | 2 | tristate "SoC Audio for the TI DAVINCI or AM33XX chip" |
3 | depends on ARCH_DAVINCI | 3 | depends on ARCH_DAVINCI || SOC_AM33XX |
4 | help | 4 | help |
5 | Platform driver for daVinci or AM33xx | ||
5 | Say Y or M if you want to add support for codecs attached to | 6 | Say Y or M if you want to add support for codecs attached to |
6 | the DAVINCI AC97 or I2S interface. You will also need | 7 | the DAVINCI AC97, I2S, or McASP interface. You will also need |
7 | to select the audio interfaces to support below. | 8 | to select the audio interfaces to support below. |
8 | 9 | ||
9 | config SND_DAVINCI_SOC_I2S | 10 | config SND_DAVINCI_SOC_I2S |
@@ -15,6 +16,17 @@ config SND_DAVINCI_SOC_MCASP | |||
15 | config SND_DAVINCI_SOC_VCIF | 16 | config SND_DAVINCI_SOC_VCIF |
16 | tristate | 17 | tristate |
17 | 18 | ||
19 | config SND_AM33XX_SOC_EVM | ||
20 | tristate "SoC Audio for the AM33XX chip based boards" | ||
21 | depends on SND_DAVINCI_SOC && SOC_AM33XX | ||
22 | select SND_SOC_TLV320AIC3X | ||
23 | select SND_DAVINCI_SOC_MCASP | ||
24 | help | ||
25 | Say Y or M if you want to add support for SoC audio on AM33XX | ||
26 | boards using McASP and TLV320AIC3X codec. For example AM335X-EVM, | ||
27 | AM335X-EVMSK, and BeagelBone with AudioCape boards have this | ||
28 | setup. | ||
29 | |||
18 | config SND_DAVINCI_SOC_EVM | 30 | config SND_DAVINCI_SOC_EVM |
19 | tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM" | 31 | tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM" |
20 | depends on SND_DAVINCI_SOC | 32 | depends on SND_DAVINCI_SOC |
diff --git a/sound/soc/davinci/Makefile b/sound/soc/davinci/Makefile index a396ab6d6d5e..bc81e79fc301 100644 --- a/sound/soc/davinci/Makefile +++ b/sound/soc/davinci/Makefile | |||
@@ -13,6 +13,7 @@ obj-$(CONFIG_SND_DAVINCI_SOC_VCIF) += snd-soc-davinci-vcif.o | |||
13 | snd-soc-evm-objs := davinci-evm.o | 13 | snd-soc-evm-objs := davinci-evm.o |
14 | 14 | ||
15 | obj-$(CONFIG_SND_DAVINCI_SOC_EVM) += snd-soc-evm.o | 15 | obj-$(CONFIG_SND_DAVINCI_SOC_EVM) += snd-soc-evm.o |
16 | obj-$(CONFIG_SND_AM33XX_SOC_EVM) += snd-soc-evm.o | ||
16 | obj-$(CONFIG_SND_DM6467_SOC_EVM) += snd-soc-evm.o | 17 | obj-$(CONFIG_SND_DM6467_SOC_EVM) += snd-soc-evm.o |
17 | obj-$(CONFIG_SND_DA830_SOC_EVM) += snd-soc-evm.o | 18 | obj-$(CONFIG_SND_DA830_SOC_EVM) += snd-soc-evm.o |
18 | obj-$(CONFIG_SND_DA850_SOC_EVM) += snd-soc-evm.o | 19 | obj-$(CONFIG_SND_DA850_SOC_EVM) += snd-soc-evm.o |