Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: alsa-devel@alsa-project.org, lars@metafoo.de,
	Jyri Sarha <jsarha@ti.com>,
	Jarkko Nikula <jarkko.nikula@bitmer.com>,
	notasas@gmail.com
Subject: [PATCH v2 11/20] ASoC: omap-abe-twl6040: Use the cpu_dai node to specify the platform driver
Date: Wed, 16 Apr 2014 15:46:21 +0300	[thread overview]
Message-ID: <1397652390-852-12-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1397652390-852-1-git-send-email-peter.ujfalusi@ti.com>

Now that the platform driver is registered with the cpu_dai's device we
can use the same node for it instead of the hardwired name.
We can also remove the cpu_dai_name and platform_name from the dai_link
struct since we only support DT boot on OMAP4/5

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 sound/soc/omap/omap-abe-twl6040.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index 024dafc3e298..1a89e5b1be16 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -214,9 +214,7 @@ static struct snd_soc_dai_link abe_twl6040_dai_links[] = {
 	{
 		.name = "TWL6040",
 		.stream_name = "TWL6040",
-		.cpu_dai_name = "omap-mcpdm",
 		.codec_dai_name = "twl6040-legacy",
-		.platform_name = "omap-pcm-audio",
 		.codec_name = "twl6040-codec",
 		.init = omap_abe_twl6040_init,
 		.ops = &omap_abe_ops,
@@ -224,9 +222,7 @@ static struct snd_soc_dai_link abe_twl6040_dai_links[] = {
 	{
 		.name = "DMIC",
 		.stream_name = "DMIC Capture",
-		.cpu_dai_name = "omap-dmic",
 		.codec_dai_name = "dmic-hifi",
-		.platform_name = "omap-pcm-audio",
 		.codec_name = "dmic-codec",
 		.init = omap_abe_dmic_init,
 		.ops = &omap_abe_dmic_ops,
@@ -281,14 +277,14 @@ static int omap_abe_probe(struct platform_device *pdev)
 		dev_err(&pdev->dev, "McPDM node is not provided\n");
 		return -EINVAL;
 	}
-	abe_twl6040_dai_links[0].cpu_dai_name  = NULL;
 	abe_twl6040_dai_links[0].cpu_of_node = dai_node;
+	abe_twl6040_dai_links[0].platform_of_node = dai_node;
 
 	dai_node = of_parse_phandle(node, "ti,dmic", 0);
 	if (dai_node) {
 		num_links = 2;
-		abe_twl6040_dai_links[1].cpu_dai_name  = NULL;
 		abe_twl6040_dai_links[1].cpu_of_node = dai_node;
+		abe_twl6040_dai_links[1].platform_of_node = dai_node;
 
 		priv->dmic_codec_dev = platform_device_register_simple(
 						"dmic-codec", -1, NULL, 0);
-- 
1.9.2

  parent reply	other threads:[~2014-04-16 12:47 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-16 12:46 [PATCH v2 00/20] ASoC: omap: Bind the omap-pcm platform driver to dai device Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 01/20] ASoC: Add resource managed snd_soc_register_platform() Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 02/20] ASoC: omap-pcm: Support for binding the platform driver to dai devices Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 03/20] ASoC: omap-mcpdm: Assign the dai DMA data at earlier time Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 04/20] ASoC: omap-mcpdm: Bind the platform driver to the dai driver when loading Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 05/20] ASoC: omap-mcbsp: Assign the dai DMA data at earlier time Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 06/20] ASoC: omap-mcbsp: Bind the platform driver to the dai driver when loading Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 07/20] ASoC: omap-dmic: Assign the dai DMA data at earlier time Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 08/20] ASoC: omap-dmic: Bind the platform driver to the dai driver when loading Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 09/20] ASoC: omap-hdmi: " Peter Ujfalusi
2014-04-21 12:54   ` Lars-Peter Clausen
2014-04-22  7:26     ` Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 10/20] ASoC: davinci-mcasp: Update MCASP_VERSION_4 platform driver registration Peter Ujfalusi
2014-04-16 12:46 ` Peter Ujfalusi [this message]
2014-04-16 12:46 ` [PATCH v2 12/20] ASoC: omap-twl4030: Use the same name/node for platform as the cpu_dai Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 13/20] ASoC: am3517evm: Use the same name " Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 14/20] ASoC: ams-delta: " Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 15/20] ASoC: n810: " Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 16/20] ASoC: omap3pandora: " Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 17/20] ASoC: osk5912: " Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 18/20] ASoC: rx51: " Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 19/20] ASoC: omap-hdmi-card: " Peter Ujfalusi
2014-04-16 12:46 ` [PATCH v2 20/20] ASoC: omap-pcm: Drop the platform driver init code Peter Ujfalusi
2014-04-18 17:05 ` [PATCH v2 00/20] ASoC: omap: Bind the omap-pcm platform driver to dai device Mark Brown

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=1397652390-852-12-git-send-email-peter.ujfalusi@ti.com \
    --to=peter.ujfalusi@ti.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=jarkko.nikula@bitmer.com \
    --cc=jsarha@ti.com \
    --cc=lars@metafoo.de \
    --cc=lgirdwood@gmail.com \
    --cc=notasas@gmail.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox