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

diff --git a/include/sound/soc.h b/include/sound/soc.h
index fb955e69a78ea29f79bd4382b492bca009cd6fe7..adb2eba0a2112d78dc1e4aadb1997774b3cd3e8d 100644 (file)
--- 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,

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a1305f827a98f077ac3cdeffed96b2ce73d45c63..251a7e8670b7e9e2d8d8999ac0742ee54e520c80 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3534,7 +3534,7 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
 }
 EXPORT_SYMBOL_GPL(snd_soc_of_parse_daifmt);
 
-static int snd_soc_get_dai_name(struct of_phandle_args *args,
+int snd_soc_get_dai_name(struct of_phandle_args *args,
                                const char **dai_name)
 {
        struct snd_soc_component *pos;
@@ -3586,6 +3586,7 @@ static int snd_soc_get_dai_name(struct of_phandle_args *args,
        mutex_unlock(&client_mutex);
        return ret;
 }
+EXPORT_SYMBOL_GPL(snd_soc_get_dai_name);
 
 int snd_soc_of_get_dai_name(struct device_node *of_node,
                            const char **dai_name)