diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-11-11 02:18:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-11-11 16:19:34 +0100 |
| commit | 7364c8dc255232db33bcd1c5b19eb8f34cf6108a (patch) | |
| tree | efa8ca58f42421bdf0fc8f2e41fbe4e66e9aa694 /include/sound | |
| parent | Linux 4.9-rc1 (diff) | |
| download | linux-7364c8dc255232db33bcd1c5b19eb8f34cf6108a.tar.xz linux-7364c8dc255232db33bcd1c5b19eb8f34cf6108a.zip | |
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 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 4f1c784e44f6..148bf553d598 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -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, |