From: Kuninori Morimoto <kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
To: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Cc: Linux-ALSA <alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org>,
Simon <horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>,
Linux-DT <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: [resend][PATCH v5 07/10] ASoC: add snd_soc_get_dai_id()
Date: Mon, 17 Apr 2017 00:23:17 +0000 [thread overview]
Message-ID: <871ssrvqbk.wl%kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87bmrvvqgs.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
From: Kuninori Morimoto <kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
ALSA SoC needs to know connected DAI ID for probing.
On OF-graph case, basically we can check DT port location.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
---
v4 -> v5
- no change
include/sound/soc.h | 1 +
sound/soc/soc-core.c | 23 +++++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index ee838b0..af73160 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1663,6 +1663,7 @@ 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_id(struct device_node *ep);
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,
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index f8608b7..0c75b0d 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -34,6 +34,7 @@
#include <linux/ctype.h>
#include <linux/slab.h>
#include <linux/of.h>
+#include <linux/of_graph.h>
#include <linux/dmi.h>
#include <sound/core.h>
#include <sound/jack.h>
@@ -4035,6 +4036,28 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
}
EXPORT_SYMBOL_GPL(snd_soc_of_parse_daifmt);
+int snd_soc_get_dai_id(struct device_node *ep)
+{
+ struct device_node *node;
+ struct device_node *endpoint;
+ int i, id;
+
+ node = of_graph_get_port_parent(ep);
+
+ i = 0;
+ id = -1;
+ for_each_endpoint_of_node(node, endpoint) {
+ if (endpoint == ep)
+ id = i;
+ i++;
+ }
+ if (id < 0)
+ return -ENODEV;
+
+ return id;
+}
+EXPORT_SYMBOL_GPL(snd_soc_get_dai_id);
+
int snd_soc_get_dai_name(struct of_phandle_args *args,
const char **dai_name)
{
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-04-17 0:23 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-17 0:20 [resend][PATCH v5 00/10] ASoC: add OF-graph base simple-card Kuninori Morimoto
[not found] ` <87bmrvvqgs.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2017-04-17 0:21 ` [resend][PATCH v5 01/10] of_graph: export symbol of_phandle_iterator_init/next Kuninori Morimoto
[not found] ` <87a87fvqfc.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2017-04-17 13:43 ` Rob Herring
[not found] ` <CAL_JsqJSN88P2D8sbWimxTjc=mUPBV4H7hfLzHCLmzZbOcZzQg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-04-18 0:05 ` Kuninori Morimoto
2017-04-18 0:06 ` Rob Herring
2017-04-17 0:21 ` [resend][PATCH v5 02/10] of_graph: add of_graph_get_remote_endpoint() Kuninori Morimoto
2017-04-17 0:22 ` [resend][PATCH v5 03/10] of_graph: add of_graph_get_port_parent() Kuninori Morimoto
2017-04-17 0:22 ` [resend][PATCH v5 04/10] of_graph: add of_graph_get_endpoint_count() Kuninori Morimoto
2017-04-17 0:22 ` [resend][PATCH v5 05/10] ASoC: simple-card-utils: enable "label" on asoc_simple_card_parse_card_name Kuninori Morimoto
[not found] ` <874lxnvqcm.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2017-04-17 13:21 ` Rob Herring
[not found] ` <CAL_JsqKPJ6WF08hEtx2Y7Z5WqUXQ0OBOeohEaPujX891ksZS2A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-04-17 23:58 ` Kuninori Morimoto
2017-04-17 0:23 ` [resend][PATCH v5 06/10] ASoC: soc-core: enable "dai-name" on snd_soc_of_parse_daifmt() Kuninori Morimoto
[not found] ` <8737d7vqc4.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2017-04-17 13:23 ` Rob Herring
[not found] ` <CAL_JsqLVM1mQWXv42N_hC+nTWV=dOaSc2wmu4SAAN3-w4O8v6w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-04-18 0:00 ` Kuninori Morimoto
[not found] ` <8737d6zizt.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2017-04-18 0:05 ` Rob Herring
[not found] ` <CAL_Jsq+D9FsL=JG+ZCm4H8VAh=fSOAJcN_30UZC36vgX8n9Dng-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-04-18 0:37 ` Kuninori Morimoto
2017-04-17 0:23 ` Kuninori Morimoto [this message]
[not found] ` <871ssrvqbk.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2017-04-17 13:41 ` [resend][PATCH v5 07/10] ASoC: add snd_soc_get_dai_id() Rob Herring
[not found] ` <CAL_JsqLm6tcupSuvsd_yjVH6Ks+cEm1_p2WBToGLpQQFGVwfhA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-04-18 0:04 ` Kuninori Morimoto
2017-04-17 0:23 ` [resend][PATCH v5 08/10] ASoC: simple-card-utils: add asoc_simple_card_parse_graph_dai() Kuninori Morimoto
2017-04-17 0:23 ` [resend][PATCH v5 09/10] ASoC: add audio-graph-card document Kuninori Morimoto
2017-04-17 0:24 ` [resend][PATCH v5 10/10] ASoC: add audio-graph-card support Kuninori Morimoto
-- strict thread matches above, loose matches on Subject: below --
2017-04-03 8:10 [resend][PATCH v5 00/10] ASoC: add OF-graph base simple-card Kuninori Morimoto
[not found] ` <87vaqlnceg.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2017-04-03 8:14 ` [resend][PATCH v5 07/10] ASoC: add snd_soc_get_dai_id() Kuninori Morimoto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871ssrvqbk.wl%kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx-zm6kxycvzfbbdgjk7y7tuq@public.gmane.org \
--cc=alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org \
--cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).