From: Pavel Machek <pavel@ucw.cz>
To: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Cc: lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz,
tiwai@suse.de, patches@opensource.wolfsonmicro.com,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: multi-card support for davinci-evm
Date: Mon, 30 Nov 2015 12:33:56 +0100 [thread overview]
Message-ID: <20151130113356.GA32172@amd> (raw)
In-Reply-To: <20151012113702.GC8805@ck-lbox>
Hi!
If I undestand things correctly... when there's more than one wm5102,
we need to dynamically allocate struct snd_soc_card. So something like this?
(Patch from v4.2)
Signed-off-by: Pavel Machek <pavel@ucw.cz>
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index 731fb0d..718631a 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -364,8 +516,11 @@ static int davinci_evm_probe(struct platform_device *pdev)
struct snd_soc_card_drvdata_davinci *drvdata = NULL;
struct clk *mclk;
int ret = 0;
+ struct snd_soc_card *card = devm_kzalloc(&pdev->dev, sizeof(struct snd_soc_card), GFP_KERNEL);
+
+ *card = evm_soc_card;
- evm_soc_card.dai_link = dai;
+ card->dai_link = dai;
dai->codec_of_node = of_parse_phandle(np, "ti,audio-codec", 0);
if (!dai->codec_of_node)
@@ -377,8 +533,8 @@ static int davinci_evm_probe(struct platform_device *pdev)
dai->platform_of_node = dai->cpu_of_node;
- evm_soc_card.dev = &pdev->dev;
- ret = snd_soc_of_parse_card_name(&evm_soc_card, "ti,model");
+ card->dev = &pdev->dev;
+ ret = snd_soc_of_parse_card_name(card, "ti,model");
if (ret)
return ret;
@@ -415,8 +588,8 @@ static int davinci_evm_probe(struct platform_device *pdev)
requestd_rate, drvdata->sysclk);
}
- snd_soc_card_set_drvdata(&evm_soc_card, drvdata);
- ret = devm_snd_soc_register_card(&pdev->dev, &evm_soc_card);
+ snd_soc_card_set_drvdata(card, drvdata);
+ ret = devm_snd_soc_register_card(&pdev->dev, card);
if (ret)
dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
next prev parent reply other threads:[~2015-11-30 11:34 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-14 11:54 System with multiple arizona (wm5102) codecs Pavel Machek
2015-09-14 11:52 ` Charles Keepax
2015-09-14 11:52 ` Charles Keepax
2015-09-14 13:31 ` Charles Keepax
2015-09-14 13:31 ` Charles Keepax
2015-09-14 20:11 ` Pavel Machek
2015-09-15 6:18 ` Pavel Machek
2015-09-15 8:06 ` Charles Keepax
2015-09-15 8:06 ` Charles Keepax
2015-09-15 8:35 ` Pavel Machek
2015-09-15 13:56 ` [alsa-devel] " Caleb Crome
2015-09-15 13:56 ` Caleb Crome
2015-09-15 14:09 ` [alsa-devel] " Mark Brown
2015-09-15 14:09 ` Mark Brown
2015-09-15 15:26 ` [alsa-devel] " Caleb Crome
2015-09-19 18:21 ` Mark Brown
2015-09-21 12:36 ` Pavel Machek
2015-10-12 9:00 ` multi-codec support for arizona-ldo1 was " Pavel Machek
2015-10-12 11:37 ` Charles Keepax
2015-10-12 11:37 ` Charles Keepax
2015-11-30 11:33 ` Pavel Machek [this message]
2015-11-30 11:37 ` multi-card support for arizona-core Pavel Machek
2015-11-30 11:37 ` Pavel Machek
2015-11-30 11:54 ` Mark Brown
2015-10-12 15:47 ` multi-codec support for arizona-ldo1 was Re: System with multiple arizona (wm5102) codecs Mark Brown
2015-10-12 20:11 ` Pavel Machek
2015-10-13 11:53 ` Mark Brown
2015-10-13 11:53 ` Mark Brown
2015-11-13 21:58 ` Pavel Machek
2015-11-13 22:53 ` Mark Brown
2015-11-14 7:44 ` Pavel Machek
2015-11-14 7:44 ` Pavel Machek
2015-11-14 12:39 ` Mark Brown
2015-11-14 17:59 ` Pavel Machek
2015-11-14 17:59 ` Pavel Machek
2015-11-14 18:49 ` Mark Brown
2015-11-14 21:16 ` Pavel Machek
2015-11-14 21:16 ` Pavel Machek
2015-11-15 0:14 ` Mark Brown
2015-11-15 0:14 ` Mark Brown
2015-11-16 7:45 ` Pavel Machek
2015-11-16 10:50 ` Mark Brown
2015-11-16 12:29 ` Pavel Machek
2015-11-16 12:29 ` Pavel Machek
2015-11-16 13:57 ` Charles Keepax
2015-11-16 13:57 ` Charles Keepax
2015-11-16 14:28 ` Charles Keepax
2015-11-16 14:28 ` Charles Keepax
2015-11-16 17:33 ` Mark Brown
2015-11-16 14:11 ` Charles Keepax
2015-11-16 14:11 ` Charles Keepax
2015-11-22 6:51 ` Pavel Machek
2015-11-22 6:51 ` Pavel Machek
2015-11-23 8:18 ` Lee Jones
2015-11-23 8:18 ` Lee Jones
2015-11-23 10:11 ` Pavel Machek
2015-11-23 10:25 ` Richard Fitzgerald
2015-11-23 10:25 ` Richard Fitzgerald
2015-11-23 11:30 ` Mark Brown
2015-11-23 11:46 ` Charles Keepax
2015-11-23 11:46 ` Charles Keepax
2015-11-23 14:31 ` Lee Jones
2015-11-23 15:00 ` Pavel Machek
2015-11-16 14:05 ` Charles Keepax
2015-11-16 14:05 ` Charles Keepax
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151130113356.GA32172@amd \
--to=pavel@ucw.cz \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.wolfsonmicro.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.wolfsonmicro.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.