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

ASoC: soc-core: support snd_soc_dai_link_component for codec_conf 



To find codec_conf component, it is using dev_name, of_node.
But, we already has this kind of finding component method by
snd_soc_dai_link_component, and snd_soc_is_matching_component().
We shouldn't have duplicate implementation to do same things.
This patch adds snd_soc_dai_link_component support to find
codec_conf component.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87lfrh59kj.wl-kuninori.morimoto.gx@renesas.com


Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 57e960f0

include/sound/soc.h

+3 −0
Original line number Diff line number Diff line
@@ -949,6 +949,7 @@ struct snd_soc_dai_link { 
#define COMP_CODEC(_name, _dai)		{ .name = _name, .dai_name = _dai, }

#define COMP_PLATFORM(_name)		{ .name = _name }

#define COMP_AUX(_name)			{ .name = _name }

#define COMP_CODEC_CONF(_name)		{ .name = _name }

#define COMP_DUMMY()			{ .name = "snd-soc-dummy", .dai_name = "snd-soc-dummy-dai", }



extern struct snd_soc_dai_link_component null_dailink_component[0];
@@ -962,6 +963,8 @@ struct snd_soc_codec_conf { 
	const char *dev_name;

	struct device_node *of_node;



	struct snd_soc_dai_link_component dlc;



	/*

	 * optional map of kcontrol, widget and path name prefixes that are

	 * associated per device

sound/soc/soc-core.c

+11 −7
Original line number Diff line number Diff line
@@ -1185,13 +1185,17 @@ static void soc_set_name_prefix(struct snd_soc_card *card, 
	for (i = 0; i < card->num_configs; i++) {

		struct snd_soc_codec_conf *map = &card->codec_conf[i];



		if (map->of_node && of_node != map->of_node)

			continue;

		if (map->dev_name && strcmp(component->name, map->dev_name))

			continue;

		/* fixme */

		if (map->dev_name)

			map->dlc.name = map->dev_name;

		if (map->of_node)

			map->dlc.of_node = map->of_node;



		if (snd_soc_is_matching_component(&map->dlc, component)) {

			component->name_prefix = map->name_prefix;

			return;

		}

	}



	/*

	 * If there is no configuration table or no match in the table,
@@ -2915,7 +2919,7 @@ void snd_soc_of_parse_node_prefix(struct device_node *np, 
		return;

	}



	codec_conf->of_node	= of_node;

	codec_conf->dlc.of_node	= of_node;

	codec_conf->name_prefix	= str;

}

EXPORT_SYMBOL_GPL(snd_soc_of_parse_node_prefix);

CRA Git | Maintained and supported by SUSTech CRA and CCSE