Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 233194
b: refs/heads/master
c: f9eb9dd
h: refs/heads/master
v: v3
  • Loading branch information
Vaibhav Bedia authored and Mark Brown committed Feb 3, 2011
1 parent 68560a4 commit 361f0c8
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 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: 0962bb217ac74c4b8fae34c5367ebc63131c962c
refs/heads/master: f9eb9dd14c2ca2a1f8d979637fb651512d16ad22
18 changes: 15 additions & 3 deletions trunk/sound/soc/davinci/davinci-evm.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,19 @@ static struct snd_soc_dai_link dm6467_evm_dai[] = {
.ops = &evm_spdif_ops,
},
};
static struct snd_soc_dai_link da8xx_evm_dai = {

static struct snd_soc_dai_link da830_evm_dai = {
.name = "TLV320AIC3X",
.stream_name = "AIC3X",
.cpu_dai_name = "davinci-mcasp.1",
.codec_dai_name = "tlv320aic3x-hifi",
.codec_name = "tlv320aic3x-codec.1-0018",
.platform_name = "davinci-pcm-audio",
.init = evm_aic3x_init,
.ops = &evm_ops,
};

static struct snd_soc_dai_link da850_evm_dai = {
.name = "TLV320AIC3X",
.stream_name = "AIC3X",
.cpu_dai_name= "davinci-mcasp.0",
Expand Down Expand Up @@ -259,13 +271,13 @@ static struct snd_soc_card dm6467_snd_soc_card_evm = {

static struct snd_soc_card da830_snd_soc_card = {
.name = "DA830/OMAP-L137 EVM",
.dai_link = &da8xx_evm_dai,
.dai_link = &da830_evm_dai,
.num_links = 1,
};

static struct snd_soc_card da850_snd_soc_card = {
.name = "DA850/OMAP-L138 EVM",
.dai_link = &da8xx_evm_dai,
.dai_link = &da850_evm_dai,
.num_links = 1,
};

Expand Down

0 comments on commit 361f0c8

Please sign in to comment.