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

Commit f23e860e authored by Nicolin Chen's avatar Nicolin Chen Committed by Mark Brown
Browse files

ASoC: core: Add extra dapm properties for Device Tree 



The current helper functions, snd_soc_of_parse_audio_simple_widgets()
and snd_soc_of_parse_audio_routing(), set dapm_widgets and dapm_routes
without caring if they are already set by using build-in widgets and
routes in the card driver. So there could be one of them, build-in one
or Device Tree one, overrided by the other depending on which one was
assigned later.

This patch adds an extra pair of dapm_widgets and dapm_routes for DT
use only so as to prevent unexpected overriding.

Signed-off-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c517d838

include/sound/soc.h

+5 −0
Original line number Diff line number Diff line
@@ -1071,11 +1071,16 @@ struct snd_soc_card { 


	/*

	 * Card-specific routes and widgets.

	 * Note: of_dapm_xxx for Device Tree; Otherwise for driver build-in.

	 */

	const struct snd_soc_dapm_widget *dapm_widgets;

	int num_dapm_widgets;

	const struct snd_soc_dapm_route *dapm_routes;

	int num_dapm_routes;

	const struct snd_soc_dapm_widget *of_dapm_widgets;

	int num_of_dapm_widgets;

	const struct snd_soc_dapm_route *of_dapm_routes;

	int num_of_dapm_routes;

	bool fully_routed;



	struct work_struct deferred_resume_work;

sound/soc/soc-core.c

+12 −4
Original line number Diff line number Diff line
@@ -1561,6 +1561,10 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) 
		snd_soc_dapm_new_controls(&card->dapm, card->dapm_widgets,

					  card->num_dapm_widgets);



	if (card->of_dapm_widgets)

		snd_soc_dapm_new_controls(&card->dapm, card->of_dapm_widgets,

					  card->num_of_dapm_widgets);



	/* initialise the sound card only once */

	if (card->probe) {

		ret = card->probe(card);
@@ -1616,6 +1620,10 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) 
		snd_soc_dapm_add_routes(&card->dapm, card->dapm_routes,

					card->num_dapm_routes);



	if (card->of_dapm_routes)

		snd_soc_dapm_add_routes(&card->dapm, card->of_dapm_routes,

					card->num_of_dapm_routes);



	for (i = 0; i < card->num_links; i++) {

		if (card->dai_link[i].dai_fmt)

			snd_soc_runtime_set_dai_fmt(&card->rtd[i],
@@ -3223,8 +3231,8 @@ int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card, 
		widgets[i].name = wname;

	}



	card->dapm_widgets = widgets;

	card->num_dapm_widgets = num_widgets;

	card->of_dapm_widgets = widgets;

	card->num_of_dapm_widgets = num_widgets;



	return 0;

}
@@ -3308,8 +3316,8 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, 
		}

	}



	card->num_dapm_routes = num_routes;

	card->dapm_routes = routes;

	card->num_of_dapm_routes = num_routes;

	card->of_dapm_routes = routes;



	return 0;

}