Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 170133
b: refs/heads/master
c: 9b95b16
h: refs/heads/master
i:
  170131: 0f62827
v: v3
  • Loading branch information
Miguel Aguilar authored and Mark Brown committed Sep 15, 2009
1 parent 824ee60 commit 229e329
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 08db48f1ee1adf8919484f731d4ad6b264cfc564
refs/heads/master: 9b95b166789d3ec57cea8cca0d42e602b8643ab0
4 changes: 2 additions & 2 deletions trunk/sound/soc/davinci/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ config SND_DAVINCI_SOC_MCASP
tristate

config SND_DAVINCI_SOC_EVM
tristate "SoC Audio support for DaVinci DM6446 or DM355 EVM"
tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM"
depends on SND_DAVINCI_SOC
depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM
depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM || MACH_DAVINCI_DM365_EVM
select SND_DAVINCI_SOC_I2S
select SND_SOC_TLV320AIC3X
help
Expand Down
7 changes: 4 additions & 3 deletions trunk/sound/soc/davinci/davinci-evm.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ static int evm_hw_params(struct snd_pcm_substream *substream,
unsigned sysclk;

/* ASP1 on DM355 EVM is clocked by an external oscillator */
if (machine_is_davinci_dm355_evm() || machine_is_davinci_dm6467_evm())
if (machine_is_davinci_dm355_evm() || machine_is_davinci_dm6467_evm() ||
machine_is_davinci_dm365_evm())
sysclk = 27000000;

/* ASP0 in DM6446 EVM is clocked by U55, as configured by
Expand Down Expand Up @@ -176,7 +177,7 @@ static struct snd_soc_dai_link da8xx_evm_dai = {
.ops = &evm_ops,
};

/* davinci-evm audio machine driver */
/* davinci dm6446, dm355 or dm365 evm audio machine driver */
static struct snd_soc_card snd_soc_card_evm = {
.name = "DaVinci EVM",
.platform = &davinci_soc_platform,
Expand Down Expand Up @@ -243,7 +244,7 @@ static int __init evm_init(void)
int index;
int ret;

if (machine_is_davinci_evm()) {
if (machine_is_davinci_evm() || machine_is_davinci_dm365_evm()) {
evm_snd_dev_data = &evm_snd_devdata;
index = 0;
} else if (machine_is_davinci_dm355_evm()) {
Expand Down

0 comments on commit 229e329

Please sign in to comment.