* [PATCH v2] asoc: davinci: da830/omap-l137: correct cpu_dai_name
@ 2011-02-03 11:12 Vaibhav Bedia
2011-02-03 16:15 ` Liam Girdwood
2011-02-03 20:22 ` Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Vaibhav Bedia @ 2011-02-03 11:12 UTC (permalink / raw)
To: alsa-devel
Cc: davinci-linux-open-source, sshtylyov, broonie, Vaibhav Bedia,
stable, lrg
McASP1 is used on the DA830/OMAP-L137 platform for the codec.
This is different from the DA850/OMAP-L138 platform which uses McASP0.
This is fixed by adding a new snd_soc_dai_link struct.
Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com>
---
v2:
Fixed the subject as pointed out by Sergei.
sound/soc/davinci/davinci-evm.c | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index b36f0b3..fe79842 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -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",
@@ -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,
};
--
1.6.2.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] asoc: davinci: da830/omap-l137: correct cpu_dai_name
2011-02-03 11:12 [PATCH v2] asoc: davinci: da830/omap-l137: correct cpu_dai_name Vaibhav Bedia
@ 2011-02-03 16:15 ` Liam Girdwood
2011-02-03 20:22 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Liam Girdwood @ 2011-02-03 16:15 UTC (permalink / raw)
To: Vaibhav Bedia
Cc: alsa-devel, broonie, davinci-linux-open-source, sshtylyov, stable
On Thu, 2011-02-03 at 16:42 +0530, Vaibhav Bedia wrote:
> McASP1 is used on the DA830/OMAP-L137 platform for the codec.
> This is different from the DA850/OMAP-L138 platform which uses McASP0.
>
> This is fixed by adding a new snd_soc_dai_link struct.
>
> Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com>
> ---
>
> v2:
> Fixed the subject as pointed out by Sergei.
>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] asoc: davinci: da830/omap-l137: correct cpu_dai_name
2011-02-03 11:12 [PATCH v2] asoc: davinci: da830/omap-l137: correct cpu_dai_name Vaibhav Bedia
2011-02-03 16:15 ` Liam Girdwood
@ 2011-02-03 20:22 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2011-02-03 20:22 UTC (permalink / raw)
To: Vaibhav Bedia
Cc: alsa-devel, lrg, davinci-linux-open-source, sshtylyov, stable
On Thu, Feb 03, 2011 at 04:42:25PM +0530, Vaibhav Bedia wrote:
> McASP1 is used on the DA830/OMAP-L137 platform for the codec.
> This is different from the DA850/OMAP-L138 platform which uses McASP0.
>
> This is fixed by adding a new snd_soc_dai_link struct.
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-03 20:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-03 11:12 [PATCH v2] asoc: davinci: da830/omap-l137: correct cpu_dai_name Vaibhav Bedia
2011-02-03 16:15 ` Liam Girdwood
2011-02-03 20:22 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).