Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 2289cc1c authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: simple-scu-card: support snd_soc_dai_link_component style for codec 



Current ASoC is supporting snd_soc_dai_link_component for binding,
it is more useful than current legacy style.
Currently only codec is supporting it as multicodec (= codecs).
CPU will support multi style in the future.
We want to have it on Platform too in the future.

If all Codec/CPU/Platform are replaced into snd_soc_dai_link_component
style, we can remove legacy complex style.
This patch supports snd_soc_dai_link_component style
for simple-scu-card for codec.

[current]
struct snd_soc_dai_link {
	...
	*cpu_name;
	*cpu_of_node;
	*cpu_dai_name;

	*codec_name;
	*codec_of_node;
	*codec_dai_name;
	*codecs;
	num_codecs;

	*platform_name;
	*platform_of_node;
	...
}

[in the future]
struct snd_soc_dai_link {
	...
	*cpus
	num_cpus;

	*codecs;
	num_codecs;

	*platform;
	...
}

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

sound/soc/generic/simple-scu-card.c

+20 −6
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ struct simple_card_data { 
	struct snd_soc_codec_conf codec_conf;

	struct simple_dai_props {

		struct asoc_simple_dai dai;

		struct snd_soc_dai_link_component codecs;

	} *dai_props;

	struct snd_soc_dai_link *dai_link;

	struct asoc_simple_card_data adata;
@@ -103,11 +104,13 @@ static int asoc_simple_card_dai_link_of(struct device_node *np, 


	if (is_fe) {

		int is_single_links = 0;

		struct snd_soc_dai_link_component *codecs;



		/* BE is dummy */

		dai_link->codec_of_node		= NULL;

		dai_link->codec_dai_name	= "snd-soc-dummy-dai";

		dai_link->codec_name		= "snd-soc-dummy";

		codecs			= dai_link->codecs;

		codecs->of_node		= NULL;

		codecs->dai_name	= "snd-soc-dummy-dai";

		codecs->name		= "snd-soc-dummy";



		/* FE settings */

		dai_link->dynamic		= 1;
@@ -149,13 +152,13 @@ static int asoc_simple_card_dai_link_of(struct device_node *np, 


		ret = asoc_simple_card_set_dailink_name(dev, dai_link,

							"be.%s",

							dai_link->codec_dai_name);

							dai_link->codecs->dai_name);

		if (ret < 0)

			return ret;



		snd_soc_of_parse_audio_prefix(card,

					      &priv->codec_conf,

					      dai_link->codec_of_node,

					      dai_link->codecs->of_node,

					      PREFIX "prefix");

	}
@@ -236,7 +239,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev) 
	struct snd_soc_card *card;

	struct device *dev = &pdev->dev;

	struct device_node *np = dev->of_node;

	int num, ret;

	int num, ret, i;



	/* Allocate the private data */

	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -250,6 +253,17 @@ static int asoc_simple_card_probe(struct platform_device *pdev) 
	if (!dai_props || !dai_link)

		return -ENOMEM;



	/*

	 * Use snd_soc_dai_link_component instead of legacy style

	 * It is codec only. but cpu/platform will be supported in the future.

	 * see

	 *	soc-core.c :: snd_soc_init_multicodec()

	 */

	for (i = 0; i < num; i++) {

		dai_link[i].codecs	= &dai_props[i].codecs;

		dai_link[i].num_codecs	= 1;

	}



	priv->dai_props				= dai_props;

	priv->dai_link				= dai_link;