diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-11-11 02:17:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-11-11 16:22:01 +0100 |
| commit | 8f5ebb1bee15b5720741a98414767bb86f6c2b23 (patch) | |
| tree | 02b7f9f4e38eb09e33253cca68099ea534512a87 /include/sound | |
| parent | ASoC: soc-core: adjust for graph on snd_soc_of_parse_audio_prefix (diff) | |
| download | linux-8f5ebb1bee15b5720741a98414767bb86f6c2b23.tar.xz linux-8f5ebb1bee15b5720741a98414767bb86f6c2b23.zip | |
ASoC: soc-core: adjust for graph on snd_soc_of_parse_card_name
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 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 346223b38e0d..8457aab9eab0 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1642,8 +1642,11 @@ static inline struct snd_soc_platform *snd_soc_kcontrol_platform( int snd_soc_util_init(void); void snd_soc_util_exit(void); -int snd_soc_of_parse_card_name(struct snd_soc_card *card, - const char *propname); +#define snd_soc_of_parse_card_name(card, propname) \ + snd_soc_of_parse_card_name_from_node(card, NULL, propname) +int snd_soc_of_parse_card_name_from_node(struct snd_soc_card *card, + struct device_node *np, + const char *propname); int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card, const char *propname); int snd_soc_of_parse_tdm_slot(struct device_node *np, |