Unverified Commit 7c2ae798 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: audio-graph-scu-card: care multi DPCM codec_conf 



Current audio-graph-scu-card didn't care about codec_conf
for multi DPCM case. This patch cares it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a1af9858

sound/soc/generic/audio-graph-scu-card.c

+29 −11
Original line number Diff line number Diff line
@@ -24,17 +24,18 @@ 


struct graph_card_data {

	struct snd_soc_card snd_card;

	struct snd_soc_codec_conf codec_conf;

	struct graph_dai_props {

		struct asoc_simple_dai *cpu_dai;

		struct asoc_simple_dai *codec_dai;

		struct snd_soc_dai_link_component codecs;

		struct snd_soc_dai_link_component platform;

		struct asoc_simple_card_data adata;

		struct snd_soc_codec_conf *codec_conf;

	} *dai_props;

	struct snd_soc_dai_link *dai_link;

	struct asoc_simple_dai *dais;

	struct asoc_simple_card_data adata;

	struct snd_soc_codec_conf *codec_conf;

};



#define graph_priv_to_card(priv) (&(priv)->snd_card)
@@ -114,7 +115,8 @@ static int asoc_graph_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
static int asoc_graph_card_dai_link_of(struct device_node *cpu_ep,

				       struct device_node *codec_ep,

				       struct graph_card_data *priv,

				       int *dai_idx, int link_idx, int is_fe)

				       int *dai_idx, int link_idx,

				       int *conf_idx, int is_fe)

{

	struct device *dev = graph_priv_to_dev(priv);

	struct snd_soc_dai_link *dai_link = graph_priv_to_link(priv, link_idx);
@@ -159,6 +161,8 @@ static int asoc_graph_card_dai_link_of(struct device_node *cpu_ep, 
		asoc_simple_card_canonicalize_cpu(dai_link,

			of_graph_get_endpoint_count(dai_link->cpu_of_node) == 1);

	} else {

		struct snd_soc_codec_conf *cconf;



		/* FE is dummy */

		dai_link->cpu_of_node		= NULL;

		dai_link->cpu_dai_name		= "snd-soc-dummy-dai";
@@ -171,6 +175,9 @@ static int asoc_graph_card_dai_link_of(struct device_node *cpu_ep, 
		dai =

		dai_props->codec_dai	= &priv->dais[(*dai_idx)++];



		cconf =

		dai_props->codec_conf	= &priv->codec_conf[(*conf_idx)++];



		ret = asoc_simple_card_parse_graph_codec(ep, dai_link);

		if (ret < 0)

			return ret;
@@ -186,14 +193,12 @@ static int asoc_graph_card_dai_link_of(struct device_node *cpu_ep, 
			return ret;



		/* check "prefix" from top node */

		snd_soc_of_parse_audio_prefix(card,

					      &priv->codec_conf,

		snd_soc_of_parse_audio_prefix(card, cconf,

					      dai_link->codecs->of_node,

					      "prefix");

		/* check "prefix" from each node if top doesn't have */

		if (!priv->codec_conf.of_node)

			snd_soc_of_parse_node_prefix(node,

						     &priv->codec_conf,

		if (!cconf->of_node)

			snd_soc_of_parse_node_prefix(node, cconf,

						     dai_link->codecs->of_node,

						     PREFIX "prefix");

	}
@@ -232,7 +237,7 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) 
	struct device_node *codec_ep;

	struct device_node *codec_port;

	struct device_node *codec_port_old;

	int dai_idx, link_idx, ret;

	int dai_idx, link_idx, conf_idx, ret;

	int rc, codec;



	if (!node)
@@ -256,6 +261,7 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) 


	link_idx = 0;

	dai_idx = 0;

	conf_idx = 0;

	codec_port_old = NULL;

	for (codec = 0; codec < 2; codec++) {

		/*
@@ -284,7 +290,8 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) 


			ret = asoc_graph_card_dai_link_of(cpu_ep, codec_ep,

							  priv, &dai_idx,

							  link_idx++, !codec);

							  link_idx++, &conf_idx,

							  !codec);

			if (ret < 0)

				goto parse_of_err;

		}
@@ -294,6 +301,14 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) 
	if (ret)

		goto parse_of_err;



	if ((card->num_links   != link_idx) ||

	    (card->num_configs != conf_idx)) {

		dev_err(dev, "dai_link or codec_config wrong (%d/%d, %d/%d)\n",

			card->num_links, link_idx, card->num_configs, conf_idx);

		ret = -EINVAL;

		goto parse_of_err;

	}



	ret = 0;



parse_of_err:
@@ -390,6 +405,7 @@ static int asoc_graph_card_probe(struct platform_device *pdev) 
	struct asoc_simple_dai *dais;

	struct device *dev = &pdev->dev;

	struct snd_soc_card *card;

	struct snd_soc_codec_conf *cconf;

	int lnum = 0, dnum = 0, cnum = 0;

	int ret, i;
@@ -405,6 +421,7 @@ static int asoc_graph_card_probe(struct platform_device *pdev) 
	dai_props = devm_kcalloc(dev, lnum, sizeof(*dai_props), GFP_KERNEL);

	dai_link  = devm_kcalloc(dev, lnum, sizeof(*dai_link),  GFP_KERNEL);

	dais      = devm_kcalloc(dev, dnum, sizeof(*dais),      GFP_KERNEL);

	cconf     = devm_kcalloc(dev, cnum, sizeof(*cconf),     GFP_KERNEL);

	if (!dai_props || !dai_link || !dais)

		return -ENOMEM;
@@ -423,6 +440,7 @@ static int asoc_graph_card_probe(struct platform_device *pdev) 
	priv->dai_props			= dai_props;

	priv->dai_link			= dai_link;

	priv->dais			= dais;

	priv->codec_conf		= cconf;



	/* Init snd_soc_card */

	card = graph_priv_to_card(priv);
@@ -430,8 +448,8 @@ static int asoc_graph_card_probe(struct platform_device *pdev) 
	card->dev		= dev;

	card->dai_link		= priv->dai_link;

	card->num_links		= lnum;

	card->codec_conf	= &priv->codec_conf;

	card->num_configs	= 1;

	card->codec_conf	= cconf;

	card->num_configs	= cnum;



	ret = asoc_graph_card_parse_of(priv);

	if (ret < 0) {