Unverified Commit 910fdcab authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-core: add .num_platform for dai_link 



Current snd_soc_dai_link is starting to use snd_soc_dai_link_component
(= modern) style for Platform, but it is still assuming single Platform
so far. We will need to have multi Platform support in the not far
future.

Currently only simple card is using it as sound card driver,
and other drivers are converted to it from legacy style by
snd_soc_init_platform().
To avoid future problem of multi Platform support, let's add
num_platforms before it is too late.

In the same time, to make it same naming mothed, "platform" should
be "platforms". This patch fixup it too.

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

include/sound/simple_card_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ void asoc_simple_card_clk_disable(struct asoc_simple_dai *dai); 
				   &dai_link->codec_dai_name,			\

				   list_name, cells_name, NULL)

#define asoc_simple_card_parse_platform(node, dai_link, list_name, cells_name)	\

	asoc_simple_card_parse_dai(node, dai_link->platform,					\

	asoc_simple_card_parse_dai(node, dai_link->platforms,			\

		&dai_link->platform_of_node,					\

		NULL, list_name, cells_name, NULL)

int asoc_simple_card_parse_dai(struct device_node *node,

include/sound/soc.h

+2 −1
Original line number Diff line number Diff line
@@ -961,7 +961,8 @@ struct snd_soc_dai_link { 
	 */

	const char *platform_name;

	struct device_node *platform_of_node;

	struct snd_soc_dai_link_component *platform;

	struct snd_soc_dai_link_component *platforms;

	unsigned int num_platforms;



	int id;	/* optional ID for machine driver link identification */

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

+3 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ struct graph_priv { 
		struct asoc_simple_dai *cpu_dai;

		struct asoc_simple_dai *codec_dai;

		struct snd_soc_dai_link_component codecs; /* single codec */

		struct snd_soc_dai_link_component platform;

		struct snd_soc_dai_link_component platforms;

		struct asoc_simple_card_data adata;

		struct snd_soc_codec_conf *codec_conf;

		unsigned int mclk_fs;
@@ -687,7 +687,8 @@ static int graph_probe(struct platform_device *pdev) 
	for (i = 0; i < li.link; i++) {

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

		dai_link[i].num_codecs	= 1;

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

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

		dai_link[i].num_platforms = 1;

	}



	priv->pa_gpio = devm_gpiod_get_optional(dev, "pa", GPIOD_OUT_LOW);

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

+2 −2
Original line number Diff line number Diff line
@@ -397,8 +397,8 @@ EXPORT_SYMBOL_GPL(asoc_simple_card_init_dai); 
int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link)

{

	/* Assumes platform == cpu */

	if (!dai_link->platform->of_node)

		dai_link->platform->of_node = dai_link->cpu_of_node;

	if (!dai_link->platforms->of_node)

		dai_link->platforms->of_node = dai_link->cpu_of_node;



	return 0;

sound/soc/generic/simple-card.c

+4 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ struct simple_priv { 
		struct asoc_simple_dai *cpu_dai;

		struct asoc_simple_dai *codec_dai;

		struct snd_soc_dai_link_component codecs; /* single codec */

		struct snd_soc_dai_link_component platform;

		struct snd_soc_dai_link_component platforms;

		struct asoc_simple_card_data adata;

		struct snd_soc_codec_conf *codec_conf;

		unsigned int mclk_fs;
@@ -732,7 +732,8 @@ static int simple_probe(struct platform_device *pdev) 
	for (i = 0; i < li.link; i++) {

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

		dai_link[i].num_codecs	= 1;

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

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

		dai_link[i].num_platforms = 1;

	}



	priv->dai_props		= dai_props;
@@ -782,7 +783,7 @@ static int simple_probe(struct platform_device *pdev) 
		codecs->name		= cinfo->codec;

		codecs->dai_name	= cinfo->codec_dai.name;



		platform		= dai_link->platform;

		platform		= dai_link->platforms;

		platform->name		= cinfo->platform;



		card->name		= (cinfo->card) ? cinfo->card : cinfo->name;

CRA Git | Maintained and supported by SUSTech CRA and CCSE