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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
1001354ca3
commit
7364c8dc25
|
@ -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,
|
||||
const char *propname);
|
||||
|
||||
#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,
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue