All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kuninori Morimoto <kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
To: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Cc: Linux-ALSA <alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org>,
	Liam Girdwood <lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
	Simon <horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH 7/8] ASoC: rsnd: add dai_link stream name
Date: Wed, 20 Aug 2014 00:11:59 -0700 (PDT)	[thread overview]
Message-ID: <8761hniqiq.wl%kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87fvgriqrb.wl%kuninori.morimoto.gx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

From: Kuninori Morimoto <kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>

This patch adds missing dai_link stream_name
which is used when DPCM

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
---
 sound/soc/sh/rcar/core.c |    8 ++++++++
 sound/soc/sh/rcar/rsnd.h |    1 +
 2 files changed, 9 insertions(+)

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 1922ec5..d25b2d7 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -854,19 +854,27 @@ static int rsnd_dai_probe(struct platform_device *pdev,
 		drv[i].name	= rdai[i].name;
 		drv[i].ops	= &rsnd_soc_dai_ops;
 		if (pmod) {
+			snprintf(rdai[i].playback.name, RSND_DAI_NAME_SIZE,
+				 "DAI%d Playback", i);
+
 			drv[i].playback.rates		= RSND_RATES;
 			drv[i].playback.formats		= RSND_FMTS;
 			drv[i].playback.channels_min	= 2;
 			drv[i].playback.channels_max	= 2;
+			drv[i].playback.stream_name	= rdai[i].playback.name;
 
 			rdai[i].playback.info = &info->dai_info[i].playback;
 			rsnd_path_init(priv, &rdai[i], &rdai[i].playback);
 		}
 		if (cmod) {
+			snprintf(rdai[i].capture.name, RSND_DAI_NAME_SIZE,
+				 "DAI%d Capture", i);
+
 			drv[i].capture.rates		= RSND_RATES;
 			drv[i].capture.formats		= RSND_FMTS;
 			drv[i].capture.channels_min	= 2;
 			drv[i].capture.channels_max	= 2;
+			drv[i].capture.stream_name	= rdai[i].capture.name;
 
 			rdai[i].capture.info = &info->dai_info[i].capture;
 			rsnd_path_init(priv, &rdai[i], &rdai[i].capture);
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index d119adf..56b93a0 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -231,6 +231,7 @@ char *rsnd_mod_dma_name(struct rsnd_mod *mod);
  */
 #define RSND_DAI_NAME_SIZE	16
 struct rsnd_dai_stream {
+	char name[RSND_DAI_NAME_SIZE];
 	struct snd_pcm_substream *substream;
 	struct rsnd_mod *mod[RSND_MOD_MAX];
 	struct rsnd_dai_path_info *info; /* rcar_snd.h */
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2014-08-20  7:11 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-20  7:06 [PATCH 0/8] ASoC: simple-card: DPCM support Kuninori Morimoto
     [not found] ` <87fvgriqrb.wl%kuninori.morimoto.gx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-08-20  7:07   ` [PATCH 1/8] ASoC: simple-card: use asoc_simple_xxx prefix Kuninori Morimoto
2014-08-20  7:07   ` [PATCH 2/8] ASoC: simple-card: remove dai_link->cpu_dai_name when DT Kuninori Morimoto
2014-08-20  7:09   ` [PATCH 3/8] ASoC: simple-card: dai_link->init should be cared when multi DAI Kuninori Morimoto
2014-08-20  7:09   ` [PATCH 4/8] ASoC: simple-card: use common for_each_child_of_node() for loop Kuninori Morimoto
2014-08-20  7:11   ` [PATCH 5/8] ASoC: simple-card: add DPCM support when DT case Kuninori Morimoto
2014-08-20  7:11   ` [PATCH 6/8] ASoC: simple-card: remove is_top_level_node from asoc_simple_card_sub_parse_of() Kuninori Morimoto
2014-08-20  7:11   ` Kuninori Morimoto [this message]
2014-08-20  7:13   ` [PATCH 8/8] ASoC: add snd-soc-dummy DT support Kuninori Morimoto
     [not found]     ` <874mx7iqgt.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2014-08-24  8:48       ` [alsa-devel] " Lars-Peter Clausen
     [not found]         ` <53F9A6EE.5070005-Qo5EllUWu/uELgA04lAiVw@public.gmane.org>
2014-08-26  0:04           ` Kuninori Morimoto
     [not found]             ` <871ts4nmki.wl%kuninori.morimoto.gx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-08-26  6:25               ` Mark Brown
     [not found]                 ` <20140826062558.GR17528-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-08-26  8:34                   ` Kuninori Morimoto
     [not found]                     ` <87wq9vmyyc.wl%kuninori.morimoto.gx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-08-26  9:11                       ` Mark Brown
     [not found]                         ` <20140826091120.GC17528-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-08-26  9:19                           ` Lars-Peter Clausen
     [not found]                             ` <53FC5105.6070901-Qo5EllUWu/uELgA04lAiVw@public.gmane.org>
2014-08-26  9:42                               ` Mark Brown
     [not found]                                 ` <20140826094211.GF17528-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-08-26 10:31                                   ` Kuninori Morimoto
     [not found]                                     ` <87r403mtip.wl%kuninori.morimoto.gx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-08-26 10:50                                       ` Mark Brown
     [not found]                                         ` <20140826105028.GK17528-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-08-27  1:11                                           ` Kuninori Morimoto
     [not found]                                             ` <87d2bmpwi2.wl%kuninori.morimoto.gx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-08-27  3:14                                               ` Kuninori Morimoto
     [not found]                                                 ` <87a96qpqsy.wl%kuninori.morimoto.gx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-08-27  8:24                                                   ` Lars-Peter Clausen
     [not found]                                                     ` <53FD95AB.6080903-Qo5EllUWu/uELgA04lAiVw@public.gmane.org>
2014-08-28  0:33                                                       ` Kuninori Morimoto
     [not found]                                                         ` <87fvghihaq.wl%kuninori.morimoto.gx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-08-28  7:23                                                           ` Lars-Peter Clausen
     [not found]                                                             ` <53FED90B.8070308-Qo5EllUWu/uELgA04lAiVw@public.gmane.org>
2014-08-28 10:41                                                               ` Kuninori Morimoto
2014-08-28  8:02                                                           ` Mark Brown
     [not found]                                                             ` <20140828080251.GG17528-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-08-28 10:56                                                               ` Kuninori Morimoto
     [not found]                                                                 ` <87sikghohq.wl%kuninori.morimoto.gx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-08-29  0:41                                                                   ` Kuninori Morimoto
2014-08-26  0:08   ` [PATCH 0/8] ASoC: simple-card: DPCM support Kuninori Morimoto
     [not found]     ` <87zjesm7sp.wl%kuninori.morimoto.gx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-08-28  3:04       ` Kuninori Morimoto
2014-08-28  3:06 ` [PATCH 0/4 v2] ASoC: simple-card: fixup for DT Kuninori Morimoto
2014-08-28  3:07   ` [PATCH 1/4 v2] ASoC: simple-card: use asoc_simple_xxx prefix Kuninori Morimoto
2014-08-29 11:49     ` Mark Brown
2014-08-28  3:08   ` [PATCH 2/4 v2] ASoC: simple-card: remove dai_link->cpu_dai_name when DT Kuninori Morimoto
2014-08-29 11:51     ` Mark Brown
2014-08-28  3:08   ` [PATCH 3/4 v2] ASoC: simple-card: dai_link->init should be cared when multi DAI Kuninori Morimoto
2014-08-29 11:51     ` Mark Brown
2014-08-28  3:08   ` [PATCH 4/4 v2] ASoC: simple-card: use common for_each_child_of_node() for loop Kuninori Morimoto
2014-08-29 11:51     ` 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=8761hniqiq.wl%kuninori.morimoto.gx@renesas.com \
    --to=kuninori.morimoto.gx-zm6kxycvzfbbdgjk7y7tuq@public.gmane.org \
    --cc=alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org \
    --cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org \
    --cc=lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    /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.