aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2015-03-19 00:15:18 -0400
committerMark Brown <broonie@kernel.org>2015-03-22 14:20:51 -0400
commitf8c3c3094302cb25d9720804b8100fdd37a3ace0 (patch)
tree2ab3e87266005a53e4fbd56e65065870abe0b384 /sound
parentd2c4b80c5b392c8437f9174161a17176b9c3cd76 (diff)
ASoC: rsnd: add dai_link stream name
This patch adds missing dai_link stream_name which is used when DPCM Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/sh/rcar/core.c8
-rw-r--r--sound/soc/sh/rcar/rsnd.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index cd78a17f9cf9..519d85692e0c 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -648,20 +648,28 @@ static int rsnd_dai_probe(struct platform_device *pdev,
648 drv[i].name = rdai[i].name; 648 drv[i].name = rdai[i].name;
649 drv[i].ops = &rsnd_soc_dai_ops; 649 drv[i].ops = &rsnd_soc_dai_ops;
650 if (pmod) { 650 if (pmod) {
651 snprintf(rdai[i].playback.name, RSND_DAI_NAME_SIZE,
652 "DAI%d Playback", i);
653
651 drv[i].playback.rates = RSND_RATES; 654 drv[i].playback.rates = RSND_RATES;
652 drv[i].playback.formats = RSND_FMTS; 655 drv[i].playback.formats = RSND_FMTS;
653 drv[i].playback.channels_min = 2; 656 drv[i].playback.channels_min = 2;
654 drv[i].playback.channels_max = 2; 657 drv[i].playback.channels_max = 2;
658 drv[i].playback.stream_name = rdai[i].playback.name;
655 659
656 rdai[i].playback.info = &info->dai_info[i].playback; 660 rdai[i].playback.info = &info->dai_info[i].playback;
657 rdai[i].playback.rdai = rdai + i; 661 rdai[i].playback.rdai = rdai + i;
658 rsnd_path_init(priv, &rdai[i], &rdai[i].playback); 662 rsnd_path_init(priv, &rdai[i], &rdai[i].playback);
659 } 663 }
660 if (cmod) { 664 if (cmod) {
665 snprintf(rdai[i].capture.name, RSND_DAI_NAME_SIZE,
666 "DAI%d Capture", i);
667
661 drv[i].capture.rates = RSND_RATES; 668 drv[i].capture.rates = RSND_RATES;
662 drv[i].capture.formats = RSND_FMTS; 669 drv[i].capture.formats = RSND_FMTS;
663 drv[i].capture.channels_min = 2; 670 drv[i].capture.channels_min = 2;
664 drv[i].capture.channels_max = 2; 671 drv[i].capture.channels_max = 2;
672 drv[i].capture.stream_name = rdai[i].capture.name;
665 673
666 rdai[i].capture.info = &info->dai_info[i].capture; 674 rdai[i].capture.info = &info->dai_info[i].capture;
667 rdai[i].capture.rdai = rdai + i; 675 rdai[i].capture.rdai = rdai + i;
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 52c401c9eeef..5f35af7ff821 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -301,6 +301,7 @@ struct dma_chan *rsnd_mod_dma_req(struct rsnd_mod *mod);
301 */ 301 */
302#define RSND_DAI_NAME_SIZE 16 302#define RSND_DAI_NAME_SIZE 16
303struct rsnd_dai_stream { 303struct rsnd_dai_stream {
304 char name[RSND_DAI_NAME_SIZE];
304 struct snd_pcm_substream *substream; 305 struct snd_pcm_substream *substream;
305 struct rsnd_mod *mod[RSND_MOD_MAX]; 306 struct rsnd_mod *mod[RSND_MOD_MAX];
306 struct rsnd_dai_path_info *info; /* rcar_snd.h */ 307 struct rsnd_dai_path_info *info; /* rcar_snd.h */