Browse Source

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>
Kuninori Morimoto 10 years ago
parent
commit
f8c3c30943
2 changed files with 9 additions and 0 deletions
  1. 8 0
      sound/soc/sh/rcar/core.c
  2. 1 0
      sound/soc/sh/rcar/rsnd.h

+ 8 - 0
sound/soc/sh/rcar/core.c

@@ -648,20 +648,28 @@ static int rsnd_dai_probe(struct platform_device *pdev,
 		drv[i].name	= rdai[i].name;
 		drv[i].name	= rdai[i].name;
 		drv[i].ops	= &rsnd_soc_dai_ops;
 		drv[i].ops	= &rsnd_soc_dai_ops;
 		if (pmod) {
 		if (pmod) {
+			snprintf(rdai[i].playback.name, RSND_DAI_NAME_SIZE,
+				 "DAI%d Playback", i);
+
 			drv[i].playback.rates		= RSND_RATES;
 			drv[i].playback.rates		= RSND_RATES;
 			drv[i].playback.formats		= RSND_FMTS;
 			drv[i].playback.formats		= RSND_FMTS;
 			drv[i].playback.channels_min	= 2;
 			drv[i].playback.channels_min	= 2;
 			drv[i].playback.channels_max	= 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;
 			rdai[i].playback.info = &info->dai_info[i].playback;
 			rdai[i].playback.rdai = rdai + i;
 			rdai[i].playback.rdai = rdai + i;
 			rsnd_path_init(priv, &rdai[i], &rdai[i].playback);
 			rsnd_path_init(priv, &rdai[i], &rdai[i].playback);
 		}
 		}
 		if (cmod) {
 		if (cmod) {
+			snprintf(rdai[i].capture.name, RSND_DAI_NAME_SIZE,
+				 "DAI%d Capture", i);
+
 			drv[i].capture.rates		= RSND_RATES;
 			drv[i].capture.rates		= RSND_RATES;
 			drv[i].capture.formats		= RSND_FMTS;
 			drv[i].capture.formats		= RSND_FMTS;
 			drv[i].capture.channels_min	= 2;
 			drv[i].capture.channels_min	= 2;
 			drv[i].capture.channels_max	= 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;
 			rdai[i].capture.info = &info->dai_info[i].capture;
 			rdai[i].capture.rdai = rdai + i;
 			rdai[i].capture.rdai = rdai + i;

+ 1 - 0
sound/soc/sh/rcar/rsnd.h

@@ -301,6 +301,7 @@ struct dma_chan *rsnd_mod_dma_req(struct rsnd_mod *mod);
  */
  */
 #define RSND_DAI_NAME_SIZE	16
 #define RSND_DAI_NAME_SIZE	16
 struct rsnd_dai_stream {
 struct rsnd_dai_stream {
+	char name[RSND_DAI_NAME_SIZE];
 	struct snd_pcm_substream *substream;
 	struct snd_pcm_substream *substream;
 	struct rsnd_mod *mod[RSND_MOD_MAX];
 	struct rsnd_mod *mod[RSND_MOD_MAX];
 	struct rsnd_dai_path_info *info; /* rcar_snd.h */
 	struct rsnd_dai_path_info *info; /* rcar_snd.h */