Commit 7364c8dc 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_routing 



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 1001354c

include/sound/soc.h

+7 −2
Original line number Diff line number Diff line
@@ -1655,8 +1655,13 @@ void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card, 
				   struct snd_soc_codec_conf *codec_conf,

				   struct device_node *of_node,

				   const char *propname);

int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,



#define snd_soc_of_parse_audio_routing(card, propname) \

	snd_soc_of_parse_audio_routing_from_node(card, NULL, propname)

int snd_soc_of_parse_audio_routing_from_node(struct snd_soc_card *card,

					     struct device_node *np,

					     const char *propname);



unsigned int snd_soc_of_parse_daifmt(struct device_node *np,

				     const char *prefix,

				     struct device_node **bitclkmaster,

sound/soc/soc-core.c

+6 −3
Original line number Diff line number Diff line
@@ -3615,14 +3615,17 @@ void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card, 
}

EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix);



int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,

int snd_soc_of_parse_audio_routing_from_node(struct snd_soc_card *card,

				   struct device_node *np,

				   const char *propname)

{

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

	int num_routes;

	struct snd_soc_dapm_route *routes;

	int i, ret;



	if (!np)

		np = card->dev->of_node;



	num_routes = of_property_count_strings(np, propname);

	if (num_routes < 0 || num_routes & 1) {

		dev_err(card->dev,
@@ -3669,7 +3672,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, 


	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_routing);

EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_routing_from_node);



unsigned int snd_soc_of_parse_daifmt(struct device_node *np,

				     const char *prefix,

CRA Git | Maintained and supported by SUSTech CRA and CCSE