diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-11-11 01:18:35 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-11-11 15:19:34 +0000 |
commit | 7364c8dc255232db33bcd1c5b19eb8f34cf6108a (patch) | |
tree | efa8ca58f42421bdf0fc8f2e41fbe4e66e9aa694 /sound/soc | |
parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
download | linux-7364c8dc255232db33bcd1c5b19eb8f34cf6108a.tar.bz2 |
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>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/soc-core.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index c0bbcd903261..ec881b8825b6 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -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, |