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, Jyri Sarha <jsarha@ti.com>,
	Jarkko Nikula <jarkko.nikula@bitmer.com>,
	notasas@gmail.com
Subject: [PATCH 03/18] ASoC: omap-mcpdm: Bind the platform driver to the dai driver when loading
Date: Wed, 16 Apr 2014 12:23:16 +0300	[thread overview]
Message-ID: <1397640211-15447-4-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1397640211-15447-1-git-send-email-peter.ujfalusi@ti.com>

Use the same device for the platform driver when registering as the dai
driver. This will enable us to clean up some DT booted cases.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 sound/soc/omap/omap-mcpdm.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 489cb1f972a6..f008eec9dd4b 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -42,6 +42,7 @@
 #include <sound/dmaengine_pcm.h>
 
 #include "omap-mcpdm.h"
+#include "omap-pcm.h"
 
 struct mcpdm_link_config {
 	u32 link_mask; /* channel mask for the direction */
@@ -461,6 +462,7 @@ static int asoc_mcpdm_probe(struct platform_device *pdev)
 {
 	struct omap_mcpdm *mcpdm;
 	struct resource *res;
+	int ret;
 
 	mcpdm = devm_kzalloc(&pdev->dev, sizeof(struct omap_mcpdm), GFP_KERNEL);
 	if (!mcpdm)
@@ -491,9 +493,13 @@ static int asoc_mcpdm_probe(struct platform_device *pdev)
 
 	mcpdm->dev = &pdev->dev;
 
-	return devm_snd_soc_register_component(&pdev->dev,
+	ret =  devm_snd_soc_register_component(&pdev->dev,
 					       &omap_mcpdm_component,
 					       &omap_mcpdm_dai, 1);
+	if (ret)
+		return ret;
+
+	return omap_pcm_platform_register(&pdev->dev);
 }
 
 static const struct of_device_id omap_mcpdm_of_match[] = {
-- 
1.9.2

  parent reply	other threads:[~2014-04-16  9:23 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-16  9:23 [PATCH 00/18] ASoC: omap: Bind the omap-pcm platform driver to dai device Peter Ujfalusi
2014-04-16  9:23 ` [PATCH 01/18] ASoC: omap-pcm: Support for binding the platform driver to dai devices Peter Ujfalusi
2014-04-16  9:30   ` Peter Ujfalusi
2014-04-16 11:01     ` Peter Ujfalusi
2014-04-16  9:23 ` [PATCH 02/18] ASoC: omap-mcpdm: Assign the dai DMA data at earlier time Peter Ujfalusi
2014-04-16 10:15   ` Mark Brown
2014-04-16 10:25     ` Peter Ujfalusi
2014-04-16 12:23       ` Lars-Peter Clausen
2014-04-16  9:23 ` Peter Ujfalusi [this message]
2014-04-16  9:23 ` [PATCH 04/18] ASoC: omap-mcbsp: " Peter Ujfalusi
2014-04-16  9:23 ` [PATCH 05/18] ASoC: omap-mcbsp: Bind the platform driver to the dai driver when loading Peter Ujfalusi
2014-04-16  9:23 ` [PATCH 06/18] ASoC: omap-dmic: Assign the dai DMA data at earlier time Peter Ujfalusi
2014-04-16  9:23 ` [PATCH 07/18] ASoC: omap-dmic: Bind the platform driver to the dai driver when loading Peter Ujfalusi
2014-04-16  9:23 ` [PATCH 08/18] ASoC: omap-hdmi: " Peter Ujfalusi
2014-04-16  9:23 ` [PATCH 09/18] ASoC: omap-abe-twl6040: Use the cpu_dai node to specify the platform driver Peter Ujfalusi
2014-04-16  9:23 ` [PATCH 10/18] ASoC: omap-twl4030: Use the same name/node for platform as the cpu_dai Peter Ujfalusi
2014-04-16  9:23 ` [PATCH 11/18] ASoC: am3517evm: Use the same name " Peter Ujfalusi
2014-04-16  9:23 ` [PATCH 12/18] ASoC: ams-delta: " Peter Ujfalusi
2014-04-16  9:23 ` [PATCH 13/18] ASoC: n810: " Peter Ujfalusi
2014-04-16  9:23 ` [PATCH 14/18] ASoC: omap3pandora: " Peter Ujfalusi
2014-04-16  9:23 ` [PATCH 15/18] ASoC: osk5912: " Peter Ujfalusi
2014-04-16  9:23 ` [PATCH 16/18] ASoC: rx51: " Peter Ujfalusi
2014-04-16  9:23 ` [PATCH 17/18] ASoC: omap-hdmi-card: " Peter Ujfalusi
2014-04-16  9:23 ` [PATCH 18/18] ASoC: omap-pcm: Drop the platform driver init code Peter Ujfalusi

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=1397640211-15447-4-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=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