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

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

ASoC: soc-core: adjust for graph on snd_soc_of_parse_audio_prefix 



It is assuming that the card related information is located on
"card" node, but graph case doesn't have it.
This patch adds node parameter to adjust for graph support

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

include/sound/soc.h

+5 −1
Original line number Diff line number Diff line
@@ -1651,7 +1651,11 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np, 
			      unsigned int *rx_mask,

			      unsigned int *slots,

			      unsigned int *slot_width);

void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card,

#define snd_soc_of_parse_audio_prefix(card, codec_conf, of_node, propname) \

	snd_soc_of_parse_audio_prefix_from_node(card, NULL, codec_conf, \

						of_node, propname)

void snd_soc_of_parse_audio_prefix_from_node(struct snd_soc_card *card,

				   struct device_node *np,

				   struct snd_soc_codec_conf *codec_conf,

				   struct device_node *of_node,

				   const char *propname);

sound/soc/soc-core.c

+6 −3
Original line number Diff line number Diff line
@@ -3595,15 +3595,18 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np, 
}

EXPORT_SYMBOL_GPL(snd_soc_of_parse_tdm_slot);



void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card,

void snd_soc_of_parse_audio_prefix_from_node(struct snd_soc_card *card,

				   struct device_node *np,

				   struct snd_soc_codec_conf *codec_conf,

				   struct device_node *of_node,

				   const char *propname)

{

	struct device_node *np = card->dev->of_node;

	const char *str;

	int ret;



	if (!np)

		np = card->dev->of_node;



	ret = of_property_read_string(np, propname, &str);

	if (ret < 0) {

		/* no prefix is not error */
@@ -3613,7 +3616,7 @@ void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card, 
	codec_conf->of_node	= of_node;

	codec_conf->name_prefix	= str;

}

EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix);

EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix_from_node);



int snd_soc_of_parse_audio_routing_from_node(struct snd_soc_card *card,

				   struct device_node *np,