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

Unverified Commit aefba455 authored by Jerome Brunet's avatar Jerome Brunet Committed by Mark Brown
Browse files

ASoC: allow soc-core to pick up name prefixes from component nodes 



When the component does not match the configuration table provided
by the card, let soc-core check the component node for a name prefix

Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d5418ae3

sound/soc/soc-core.c

+23 −5
Original line number Diff line number Diff line
@@ -1193,15 +1193,27 @@ void snd_soc_remove_dai_link(struct snd_soc_card *card, 
}

EXPORT_SYMBOL_GPL(snd_soc_remove_dai_link);



static void soc_set_of_name_prefix(struct snd_soc_component *component)

{

	struct device_node *component_of_node = component->dev->of_node;

	const char *str;

	int ret;



	if (!component_of_node && component->dev->parent)

		component_of_node = component->dev->parent->of_node;



	ret = of_property_read_string(component_of_node, "sound-name-prefix",

				      &str);

	if (!ret)

		component->name_prefix = str;

}



static void soc_set_name_prefix(struct snd_soc_card *card,

				struct snd_soc_component *component)

{

	int i;



	if (card->codec_conf == NULL)

		return;



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

	for (i = 0; i < card->num_configs && card->codec_conf; i++) {

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

		struct device_node *component_of_node = component->dev->of_node;
@@ -1213,8 +1225,14 @@ static void soc_set_name_prefix(struct snd_soc_card *card, 
		if (map->dev_name && strcmp(component->name, map->dev_name))

			continue;

		component->name_prefix = map->name_prefix;

		break;

		return;

	}



	/*

	 * If there is no configuration table or no match in the table,

	 * check if a prefix is provided in the node

	 */

	soc_set_of_name_prefix(component);

}



static int soc_probe_component(struct snd_soc_card *card,