diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-11-11 01:19:28 +0000 |
|---|---|---|
| committer | Sugar Zhang <sugar.zhang@rock-chips.com> | 2017-03-09 18:06:59 +0800 |
| commit | 07f270f2971d4830d82e3ba140897556c84f0ff7 (patch) | |
| tree | 0728f0a9906eb737d648cddb7e1027fe1ef75677 /include/sound | |
| parent | c2b3e8740d8dcadbf90f8e9d947841cd2b7baa4a (diff) | |
UPSTREAM: ASoC: soc-core: snd_soc_get_dai_name() become non static
snd_soc_get_dai_name() is used from snd_soc_of_get_dai_name(),
and it is assuming that DT is using "sound-dai" / "#sound-dai-cells".
But graph base DT is using "remote-endpoint". This patch makes
snd_soc_get_dai_name() non static for graph support.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
(cherry picked from commit 1ad8ec535b997ed36c0f32c2616206725258dd30)
Change-Id: If99dcbfa722f09e3238cfafb5dc2803b6636a2e0
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index fb955e69a78e..adb2eba0a211 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1638,6 +1638,8 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np, const char *prefix, struct device_node **bitclkmaster, struct device_node **framemaster); +int snd_soc_get_dai_name(struct of_phandle_args *args, + const char **dai_name); int snd_soc_of_get_dai_name(struct device_node *of_node, const char **dai_name); int snd_soc_of_get_dai_link_codecs(struct device *dev, |