diff options
author | Miguel Aguilar <miguel.aguilar@ridgerun.com> | 2009-09-02 17:33:59 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-15 14:31:05 -0400 |
commit | 9b95b166789d3ec57cea8cca0d42e602b8643ab0 (patch) | |
tree | 473ea0295a0f075dea47441499afd6ec565c54d9 /sound/soc/davinci | |
parent | 08db48f1ee1adf8919484f731d4ad6b264cfc564 (diff) |
ASoC: Davinci: Add audio codec support for DM365 EVM
This patch enables tlv320aic3101 support on DM365 EVM and
it was tested on DM365 EVM rev c.
Note: this patch was created based on temp/asoc branch.
Signed-off-by: Miguel Aguilar <miguel.aguilar@ridgerun.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/davinci')
-rw-r--r-- | sound/soc/davinci/Kconfig | 4 | ||||
-rw-r--r-- | sound/soc/davinci/davinci-evm.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig index 4dfd4ad9d90e..047ee39418c0 100644 --- a/sound/soc/davinci/Kconfig +++ b/sound/soc/davinci/Kconfig | |||
@@ -13,9 +13,9 @@ config SND_DAVINCI_SOC_MCASP | |||
13 | tristate | 13 | tristate |
14 | 14 | ||
15 | config SND_DAVINCI_SOC_EVM | 15 | config SND_DAVINCI_SOC_EVM |
16 | tristate "SoC Audio support for DaVinci DM6446 or DM355 EVM" | 16 | tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM" |
17 | depends on SND_DAVINCI_SOC | 17 | depends on SND_DAVINCI_SOC |
18 | depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM | 18 | depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM || MACH_DAVINCI_DM365_EVM |
19 | select SND_DAVINCI_SOC_I2S | 19 | select SND_DAVINCI_SOC_I2S |
20 | select SND_SOC_TLV320AIC3X | 20 | select SND_SOC_TLV320AIC3X |
21 | help | 21 | help |
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 67414f659405..7ccbe6684fc2 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c | |||
@@ -45,7 +45,8 @@ static int evm_hw_params(struct snd_pcm_substream *substream, | |||
45 | unsigned sysclk; | 45 | unsigned sysclk; |
46 | 46 | ||
47 | /* ASP1 on DM355 EVM is clocked by an external oscillator */ | 47 | /* ASP1 on DM355 EVM is clocked by an external oscillator */ |
48 | if (machine_is_davinci_dm355_evm() || machine_is_davinci_dm6467_evm()) | 48 | if (machine_is_davinci_dm355_evm() || machine_is_davinci_dm6467_evm() || |
49 | machine_is_davinci_dm365_evm()) | ||
49 | sysclk = 27000000; | 50 | sysclk = 27000000; |
50 | 51 | ||
51 | /* ASP0 in DM6446 EVM is clocked by U55, as configured by | 52 | /* ASP0 in DM6446 EVM is clocked by U55, as configured by |
@@ -176,7 +177,7 @@ static struct snd_soc_dai_link da8xx_evm_dai = { | |||
176 | .ops = &evm_ops, | 177 | .ops = &evm_ops, |
177 | }; | 178 | }; |
178 | 179 | ||
179 | /* davinci-evm audio machine driver */ | 180 | /* davinci dm6446, dm355 or dm365 evm audio machine driver */ |
180 | static struct snd_soc_card snd_soc_card_evm = { | 181 | static struct snd_soc_card snd_soc_card_evm = { |
181 | .name = "DaVinci EVM", | 182 | .name = "DaVinci EVM", |
182 | .platform = &davinci_soc_platform, | 183 | .platform = &davinci_soc_platform, |
@@ -243,7 +244,7 @@ static int __init evm_init(void) | |||
243 | int index; | 244 | int index; |
244 | int ret; | 245 | int ret; |
245 | 246 | ||
246 | if (machine_is_davinci_evm()) { | 247 | if (machine_is_davinci_evm() || machine_is_davinci_dm365_evm()) { |
247 | evm_snd_dev_data = &evm_snd_devdata; | 248 | evm_snd_dev_data = &evm_snd_devdata; |
248 | index = 0; | 249 | index = 0; |
249 | } else if (machine_is_davinci_dm355_evm()) { | 250 | } else if (machine_is_davinci_dm355_evm()) { |