From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Rob Herring <robh+dt@kernel.org>, Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>,
Liam Girdwood <lgirdwood@gmail.com>, Simon <horms@verge.net.au>,
Laurent <laurent.pinchart@ideasonboard.com>,
Guennadi <g.liakhovetski@gmx.de>,
Grant Likely <grant.likely@linaro.org>,
Frank Rowand <frowand.list@gmail.com>,
Linux-DT <devicetree@vger.kernel.org>,
Linux-Kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH v5 08/14] ASoC: simple-card-utils: adjust for graph on asoc_simple_card_parse_card_name
Date: Mon, 28 Nov 2016 02:46:59 +0000 [thread overview]
Message-ID: <878ts4wcdi.wl%kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87k2bowckx.wl%kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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>
---
include/sound/simple_card_utils.h | 1 +
sound/soc/generic/simple-card-utils.c | 3 ++-
sound/soc/generic/simple-card.c | 2 +-
sound/soc/generic/simple-scu-card.c | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index fd641255..09750ac 100644
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -32,6 +32,7 @@ int asoc_simple_card_set_dailink_name(struct device *dev,
struct snd_soc_dai_link *dai_link,
const char *fmt, ...);
int asoc_simple_card_parse_card_name(struct snd_soc_card *card,
+ struct device_node *node,
char *prefix);
#define asoc_simple_card_parse_clk_cpu(node, dai_link, simple_dai) \
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 1cb3930..003331e 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -79,6 +79,7 @@ int asoc_simple_card_set_dailink_name(struct device *dev,
EXPORT_SYMBOL_GPL(asoc_simple_card_set_dailink_name);
int asoc_simple_card_parse_card_name(struct snd_soc_card *card,
+ struct device_node *node,
char *prefix)
{
char prop[128];
@@ -87,7 +88,7 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card,
snprintf(prop, sizeof(prop), "%sname", prefix);
/* Parse the card name from DT */
- ret = snd_soc_of_parse_card_name(card, prop);
+ ret = snd_soc_of_parse_card_name_from_node(card, node, prop);
if (ret < 0)
return ret;
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index f608f8d2..342ff53 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -401,7 +401,7 @@ static int asoc_simple_card_parse_of(struct device_node *node,
goto card_parse_end;
}
- ret = asoc_simple_card_parse_card_name(&priv->snd_card, PREFIX);
+ ret = asoc_simple_card_parse_card_name(&priv->snd_card, NULL, PREFIX);
if (ret < 0)
goto card_parse_end;
diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c
index b9973a5..129dd8f 100644
--- a/sound/soc/generic/simple-scu-card.c
+++ b/sound/soc/generic/simple-scu-card.c
@@ -272,7 +272,7 @@ static int asoc_simple_card_parse_of(struct device_node *node,
if (ret < 0)
return ret;
- ret = asoc_simple_card_parse_card_name(&priv->snd_card, PREFIX);
+ ret = asoc_simple_card_parse_card_name(&priv->snd_card, NULL, PREFIX);
if (ret < 0)
return ret;
--
1.9.1
next prev parent reply other threads:[~2016-11-28 2:47 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-28 2:42 [PATCH v5 00/14] ASoC: add OF graph base simple-card Kuninori Morimoto
2016-11-28 2:44 ` [PATCH v5 01/14] Documentation: of: add type property Kuninori Morimoto
2016-12-01 16:26 ` Rob Herring
2016-12-08 1:57 ` Kuninori Morimoto
2016-11-28 2:45 ` [PATCH v5 02/14] of_graph: add of_graph_get_remote_endpoint() Kuninori Morimoto
2016-11-28 2:45 ` [PATCH v5 03/14] of_graph: add of_graph_port_type_is() Kuninori Morimoto
2016-11-28 2:45 ` [PATCH v5 04/14] of_graph: add of_graph_get_port_parent() Kuninori Morimoto
2016-11-28 2:46 ` [PATCH v5 05/14] of_graph: add of_graph_get_top_port() Kuninori Morimoto
2016-11-28 2:46 ` [PATCH v5 06/14] of_graph: add for_each_of_port() / for_each_of_endpoint_in_port() Kuninori Morimoto
2016-11-28 2:46 ` [PATCH v5 07/14] of_graph: add of_graph_get_endpoint_count() Kuninori Morimoto
2016-11-28 2:46 ` Kuninori Morimoto [this message]
2016-11-28 2:47 ` [PATCH v5 09/14] ASoC: simple-card-utils: add asoc_simple_card_parse_graph_dai() Kuninori Morimoto
2016-11-28 3:41 ` kbuild test robot
2016-11-28 4:10 ` Kuninori Morimoto
2016-11-28 2:47 ` [PATCH v5 10/14] ASoC: simple-card-utils: add asoc_simple_card_try_to_probe_graph_card() Kuninori Morimoto
2016-11-28 2:47 ` [PATCH v5 11/14] ASoC: add simple-graph-card document Kuninori Morimoto
2016-12-02 13:50 ` Rob Herring
2016-12-04 23:48 ` Kuninori Morimoto
2016-12-05 2:38 ` Kuninori Morimoto
2016-12-05 22:58 ` Rob Herring
2016-12-06 0:57 ` Kuninori Morimoto
2016-12-06 15:03 ` Rob Herring
2016-12-07 0:10 ` Kuninori Morimoto
2016-12-05 2:21 ` Kuninori Morimoto
2016-11-28 2:48 ` [PATCH v5 12/14] ASoC: add simple-graph-card support Kuninori Morimoto
2016-11-28 4:19 ` kbuild test robot
2016-11-28 2:48 ` [PATCH v5 13/14] ASoC: add simple-graph-scu-card document Kuninori Morimoto
2016-12-05 22:40 ` Rob Herring
2016-12-06 6:33 ` Kuninori Morimoto
2016-11-28 2:48 ` [PATCH v5 14/14] ASoC: add simple-graph-scu-card support Kuninori Morimoto
2016-11-28 4:36 ` kbuild test robot
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=878ts4wcdi.wl%kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=g.liakhovetski@gmx.de \
--cc=grant.likely@linaro.org \
--cc=horms@verge.net.au \
--cc=laurent.pinchart@ideasonboard.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.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
all inboxes | Powered by JetHome®