| Message ID | 87h98b4c30.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1ad8ec535b997ed36c0f32c2616206725258dd30 |
| Headers | show |
On Mon, 17 Oct 2016 08:34:19 +0000 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> wrote: > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > 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> > --- > include/sound/soc.h | 2 ++ > sound/soc/soc-core.c | 3 ++- > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/include/sound/soc.h b/include/sound/soc.h > index fd63d23..77b01c4 100644 > --- a/include/sound/soc.h > +++ b/include/sound/soc.h > @@ -1677,6 +1677,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 8371488..6f911f4 100644 > --- a/sound/soc/soc-core.c > +++ b/sound/soc/soc-core.c > @@ -3794,7 +3794,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; > @@ -3846,6 +3846,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) > -- > 1.9.1 I already proposed this patch http://mailman.alsa-project.org/pipermail/alsa-devel/2015-January/086870.html but it seems people were not interested. I hope now is the right time. Acked-by: Jean-Francois Moine <moinejf@free.fr>
diff --git a/include/sound/soc.h b/include/sound/soc.h index fd63d23..77b01c4 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1677,6 +1677,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 8371488..6f911f4 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3794,7 +3794,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; @@ -3846,6 +3846,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)