From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>,
Liam Girdwood <lgirdwood@gmail.com>, Simon <horms@verge.net.au>,
<linux-renesas-soc@vger.kernel.org>
Subject: [PATCH 18/49] ASoC: simple-card-core: add asoc_simple_card_canonicalize_cpu()
Date: Fri, 20 May 2016 09:50:01 +0000 [thread overview]
Message-ID: <87vb29qd2j.wl%kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87lh35rs8w.wl%kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
simple-card needs remove dai_link->cpu_dai_name if it CPU was
single DAI.
This patch makes this method simple style standard.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
include/sound/simple_card_core.h | 2 ++
sound/soc/generic/simple-card-core.c | 19 +++++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/include/sound/simple_card_core.h b/include/sound/simple_card_core.h
index 2db9de8..cd69d52 100644
--- a/include/sound/simple_card_core.h
+++ b/include/sound/simple_card_core.h
@@ -98,5 +98,7 @@ int asoc_simple_card_init_dai(struct snd_soc_dai *dai,
struct asoc_simple_dai *simple_dai);
int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link);
+int asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
+ int is_single_links);
#endif /* __SIMPLE_CARD_CORE_H */
diff --git a/sound/soc/generic/simple-card-core.c b/sound/soc/generic/simple-card-core.c
index 5c2ea50..bcc7826 100644
--- a/sound/soc/generic/simple-card-core.c
+++ b/sound/soc/generic/simple-card-core.c
@@ -373,3 +373,22 @@ int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link)
return 0;
}
EXPORT_SYMBOL_GPL(asoc_simple_card_canonicalize_dailink);
+
+int asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
+ int is_single_links)
+{
+ /*
+ * In soc_bind_dai_link() will check cpu name after
+ * of_node matching if dai_link has cpu_dai_name.
+ * but, it will never match if name was created by
+ * fmt_single_name() remove cpu_dai_name if cpu_args
+ * was 0. See:
+ * fmt_single_name()
+ * fmt_multiple_name()
+ */
+ if (is_single_links)
+ dai_link->cpu_dai_name = NULL;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(asoc_simple_card_canonicalize_cpu);
--
1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>,
Liam Girdwood <lgirdwood@gmail.com>, Simon <horms@verge.net.au>,
linux-renesas-soc@vger.kernel.org
Subject: [PATCH 18/49] ASoC: simple-card-core: add asoc_simple_card_canonicalize_cpu()
Date: Fri, 20 May 2016 09:50:01 +0000 [thread overview]
Message-ID: <87vb29qd2j.wl%kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87lh35rs8w.wl%kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
simple-card needs remove dai_link->cpu_dai_name if it CPU was
single DAI.
This patch makes this method simple style standard.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
include/sound/simple_card_core.h | 2 ++
sound/soc/generic/simple-card-core.c | 19 +++++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/include/sound/simple_card_core.h b/include/sound/simple_card_core.h
index 2db9de8..cd69d52 100644
--- a/include/sound/simple_card_core.h
+++ b/include/sound/simple_card_core.h
@@ -98,5 +98,7 @@ int asoc_simple_card_init_dai(struct snd_soc_dai *dai,
struct asoc_simple_dai *simple_dai);
int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link);
+int asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
+ int is_single_links);
#endif /* __SIMPLE_CARD_CORE_H */
diff --git a/sound/soc/generic/simple-card-core.c b/sound/soc/generic/simple-card-core.c
index 5c2ea50..bcc7826 100644
--- a/sound/soc/generic/simple-card-core.c
+++ b/sound/soc/generic/simple-card-core.c
@@ -373,3 +373,22 @@ int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link)
return 0;
}
EXPORT_SYMBOL_GPL(asoc_simple_card_canonicalize_dailink);
+
+int asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
+ int is_single_links)
+{
+ /*
+ * In soc_bind_dai_link() will check cpu name after
+ * of_node matching if dai_link has cpu_dai_name.
+ * but, it will never match if name was created by
+ * fmt_single_name() remove cpu_dai_name if cpu_args
+ * was 0. See:
+ * fmt_single_name()
+ * fmt_multiple_name()
+ */
+ if (is_single_links)
+ dai_link->cpu_dai_name = NULL;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(asoc_simple_card_canonicalize_cpu);
--
1.9.1
next prev parent reply other threads:[~2016-05-20 9:50 UTC|newest]
Thread overview: 139+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-20 9:36 [PATCH 00/49] ASoC: add simple-card-core and standardize "simple" card Kuninori Morimoto
2016-05-20 9:36 ` Kuninori Morimoto
2016-05-20 9:38 ` [PATCH 01/49] ASoC: simple-card: remove duplicate header Kuninori Morimoto
2016-05-20 9:38 ` Kuninori Morimoto
2016-05-30 16:00 ` Mark Brown
2016-05-30 23:53 ` Kuninori Morimoto
2016-05-30 23:53 ` Kuninori Morimoto
2016-05-20 9:39 ` [PATCH 02/49] ASoC: rsrc-card: " Kuninori Morimoto
2016-05-20 9:39 ` Kuninori Morimoto
2016-05-20 9:39 ` [PATCH 03/49] ASoC: rsrc-card: remove unused dai_num Kuninori Morimoto
2016-05-20 9:39 ` Kuninori Morimoto
2016-05-30 16:01 ` Applied "ASoC: rsrc-card: remove unused dai_num" to the asoc tree Mark Brown
2016-05-30 16:01 ` Mark Brown
2016-05-20 9:40 ` [PATCH 04/49] ASoC: simple-card: platform also uses asoc_simple_card_sub_parse_of() Kuninori Morimoto
2016-05-20 9:40 ` Kuninori Morimoto
2016-05-30 17:39 ` Applied "ASoC: simple-card: platform also uses asoc_simple_card_sub_parse_of()" to the asoc tree Mark Brown
2016-05-30 17:39 ` Mark Brown
2016-05-20 9:42 ` [PATCH 05/49] ASoC: add new simple-card-core.c Kuninori Morimoto
2016-05-20 9:42 ` Kuninori Morimoto
2016-05-30 16:22 ` Mark Brown
2016-05-20 9:42 ` [PATCH 06/49] ASoC: simple-card-core: add asoc_simple_card_parse_tdm() Kuninori Morimoto
2016-05-20 9:42 ` Kuninori Morimoto
2016-05-20 9:44 ` [PATCH 07/49] ASoC: simple-card-core: add asoc_simple_card_parse_dailink_name() Kuninori Morimoto
2016-05-20 9:44 ` Kuninori Morimoto
2016-05-20 9:44 ` [PATCH 08/49] ASoC: simple-card-core: add asoc_simple_card_parse_card_name() Kuninori Morimoto
2016-05-20 9:44 ` Kuninori Morimoto
2016-05-20 9:45 ` [PATCH 09/49] ASoC: simple-card-core: add asoc_simple_card_parse_card_prefix() Kuninori Morimoto
2016-05-20 9:45 ` Kuninori Morimoto
2016-05-20 9:45 ` [PATCH 10/49] ASoC: simple-card-core: add asoc_simple_card_parse_card_widgets() Kuninori Morimoto
2016-05-20 9:45 ` Kuninori Morimoto
2016-05-20 9:46 ` [PATCH 11/49] " Kuninori Morimoto
2016-05-20 9:46 ` Kuninori Morimoto
2016-05-30 16:23 ` Mark Brown
2016-05-31 2:05 ` Kuninori Morimoto
2016-05-31 2:05 ` Kuninori Morimoto
2016-05-31 2:19 ` Kuninori Morimoto
2016-05-31 2:19 ` Kuninori Morimoto
2016-05-20 9:47 ` [PATCH 12/49] ASoC: simple-card-core: add asoc_simple_card_parse_clk() Kuninori Morimoto
2016-05-20 9:47 ` Kuninori Morimoto
2016-05-20 9:47 ` [PATCH 13/49] ASoC: simple-card-core: add asoc_simple_card_parse_endpoint() Kuninori Morimoto
2016-05-20 9:47 ` Kuninori Morimoto
2016-05-20 9:48 ` [PATCH 14/49] ASoC: simple-card-core: add asoc_simple_card_parse_dpcm() Kuninori Morimoto
2016-05-20 9:48 ` Kuninori Morimoto
2016-05-30 16:47 ` Mark Brown
2016-05-31 0:17 ` Kuninori Morimoto
2016-05-31 0:17 ` Kuninori Morimoto
2016-05-20 9:48 ` [PATCH 15/49] ASoC: simple-card-core: add asoc_simple_card_init_jack() Kuninori Morimoto
2016-05-20 9:48 ` Kuninori Morimoto
2016-05-30 17:14 ` Mark Brown
2016-05-31 2:08 ` Kuninori Morimoto
2016-05-31 2:08 ` Kuninori Morimoto
2016-05-31 14:51 ` Mark Brown
2016-05-20 9:49 ` [PATCH 16/49] ASoC: simple-card-core: add asoc_simple_card_init_dai() Kuninori Morimoto
2016-05-20 9:49 ` Kuninori Morimoto
2016-05-20 9:49 ` [PATCH 17/49] ASoC: simple-card-core: add asoc_simple_card_canonicalize_dailink() Kuninori Morimoto
2016-05-20 9:49 ` Kuninori Morimoto
2016-05-20 9:50 ` Kuninori Morimoto [this message]
2016-05-20 9:50 ` [PATCH 18/49] ASoC: simple-card-core: add asoc_simple_card_canonicalize_cpu() Kuninori Morimoto
2016-05-20 9:50 ` [PATCH 19/49] ASoC: simple-card-core: add asoc_simple_card_clean_reference() Kuninori Morimoto
2016-05-20 9:50 ` Kuninori Morimoto
2016-05-20 9:50 ` [PATCH 20/49] ASoC: simple-card: use asoc_simple_card_parse_daifmt() Kuninori Morimoto
2016-05-20 9:50 ` Kuninori Morimoto
2016-05-20 9:51 ` [PATCH 21/49] ASoC: simple-card: use asoc_simple_card_parse_clk() Kuninori Morimoto
2016-05-20 9:51 ` Kuninori Morimoto
2016-08-05 12:09 ` Applied "ASoC: simple-card: use asoc_simple_card_parse_clk()" to the asoc tree Mark Brown
2016-08-05 12:09 ` Mark Brown
2016-05-20 9:51 ` [PATCH 22/49] ASoC: simple-card: use asoc_simple_card_parse_endpoint() Kuninori Morimoto
2016-05-20 9:51 ` Kuninori Morimoto
2016-05-20 9:52 ` Kuninori Morimoto
2016-05-20 9:52 ` Kuninori Morimoto
2016-05-20 9:54 ` [PATCH 23/49] ASoC: simple-card: use asoc_simple_card_parse_tdm() Kuninori Morimoto
2016-05-20 9:54 ` Kuninori Morimoto
2016-05-20 9:54 ` [PATCH 24/49] ASoC: simple-card: use asoc_simple_card_parse_card_name() Kuninori Morimoto
2016-05-20 9:54 ` Kuninori Morimoto
2016-05-20 9:55 ` [PATCH 25/49] ASoC: simple-card: use asoc_simple_card_parse_card_route() Kuninori Morimoto
2016-05-20 9:55 ` Kuninori Morimoto
2016-05-20 9:56 ` [PATCH 26/49] ASoC: simple-card: use asoc_simple_card_parse_card_widgets() Kuninori Morimoto
2016-05-20 9:56 ` Kuninori Morimoto
2016-05-20 9:56 ` [PATCH 27/49] ASoC: simple-card: use asoc_simple_card_parse_dailink_name() Kuninori Morimoto
2016-05-20 9:56 ` Kuninori Morimoto
2016-05-20 9:56 ` [PATCH 28/49] ASoC: simple-card: use asoc_simple_card_init_jack() Kuninori Morimoto
2016-05-20 9:56 ` Kuninori Morimoto
2016-05-20 9:57 ` [PATCH 29/49] ASoC: simple-card: use asoc_simple_card_init_dai() Kuninori Morimoto
2016-05-20 9:57 ` Kuninori Morimoto
2016-08-09 12:43 ` Applied "ASoC: simple-card: use asoc_simple_card_init_dai()" to the asoc tree Mark Brown
2016-08-09 12:43 ` Mark Brown
2016-05-20 9:57 ` [PATCH 30/49] ASoC: simple-card: use asoc_simple_card_canonicalize_dailink() Kuninori Morimoto
2016-05-20 9:57 ` Kuninori Morimoto
2016-05-20 9:58 ` [PATCH 31/49] ASoC: simple-card: use asoc_simple_card_canonicalize_cpu() Kuninori Morimoto
2016-05-20 9:58 ` Kuninori Morimoto
2016-05-20 9:58 ` [PATCH 32/49] ASoC: simple-card: use asoc_simple_card_clean_reference() Kuninori Morimoto
2016-05-20 9:58 ` Kuninori Morimoto
2016-08-10 20:03 ` Applied "ASoC: simple-card: use asoc_simple_card_clean_reference()" to the asoc tree Mark Brown
2016-08-10 20:03 ` Mark Brown
2016-05-20 9:59 ` [PATCH 33/49] ASoC: rsrc-card: use asoc_simple_card_parse_daifmt() Kuninori Morimoto
2016-05-20 9:59 ` Kuninori Morimoto
2016-05-20 9:59 ` [PATCH 34/49] ASoC: rsrc-card: use asoc_simple_card_parse_dailink_name() Kuninori Morimoto
2016-05-20 9:59 ` Kuninori Morimoto
2016-05-20 10:00 ` [PATCH 35/49] ASoC: rsrc-card: use asoc_simple_dai instead of rsrc_card_dai Kuninori Morimoto
2016-05-20 10:00 ` Kuninori Morimoto
2016-05-20 10:01 ` [PATCH 36/49] ASoC: rsrc-card: use asoc_simple_card_parse_clk() Kuninori Morimoto
2016-05-20 10:01 ` Kuninori Morimoto
2016-05-20 10:02 ` [PATCH 37/49] ASoC: rsrc-card: use asoc_simple_card_parse_endpoint() Kuninori Morimoto
2016-05-20 10:02 ` Kuninori Morimoto
2016-08-08 10:46 ` Applied "ASoC: rsrc-card: use asoc_simple_card_parse_dai()" to the asoc tree Mark Brown
2016-08-08 10:46 ` Mark Brown
2016-05-20 10:02 ` [PATCH 38/49] ASoC: rsrc-card: use asoc_simple_card_parse_card_name() Kuninori Morimoto
2016-05-20 10:02 ` Kuninori Morimoto
2016-07-16 12:05 ` Applied "ASoC: rsrc-card: use asoc_simple_card_parse_card_name()" to the asoc tree Mark Brown
2016-07-16 12:05 ` Mark Brown
2016-05-20 10:03 ` [PATCH 39/49] ASoC: rsrc-card: use asoc_simple_card_parse_card_prefix() Kuninori Morimoto
2016-05-20 10:03 ` Kuninori Morimoto
2016-05-20 10:03 ` [PATCH 40/49] ASoC: rsrc-card: use asoc_simple_card_parse_dpcm() Kuninori Morimoto
2016-05-20 10:03 ` Kuninori Morimoto
2016-05-20 10:04 ` [PATCH 41/49] ASoC: rsrc-card: use asoc_simple_card_parse_card_route() Kuninori Morimoto
2016-05-20 10:04 ` Kuninori Morimoto
2016-05-20 10:04 ` [PATCH 42/49] ASoC: rsrc-card: use asoc_simple_card_parse_tdm() Kuninori Morimoto
2016-05-20 10:04 ` Kuninori Morimoto
2016-05-20 10:05 ` [PATCH 43/49] ASoC: rsrc-card: use asoc_simple_card_init_dai() Kuninori Morimoto
2016-05-20 10:05 ` Kuninori Morimoto
2016-08-09 12:43 ` Applied "ASoC: rsrc-card: use asoc_simple_card_init_dai()" to the asoc tree Mark Brown
2016-08-09 12:43 ` Mark Brown
2016-05-20 10:05 ` [PATCH 44/49] ASoC: rsrc-card: use asoc_simple_card_canonicalize_cpu() Kuninori Morimoto
2016-05-20 10:05 ` Kuninori Morimoto
2016-05-20 10:05 ` [PATCH 45/49] ASoC: rsrc-card: use asoc_simple_card_canonicalize_dailink() Kuninori Morimoto
2016-05-20 10:05 ` Kuninori Morimoto
2016-05-20 10:06 ` [PATCH 46/49] ASoC: rsrc-card: use asoc_simple_card_clean_reference() Kuninori Morimoto
2016-05-20 10:06 ` Kuninori Morimoto
2016-08-10 20:03 ` Applied "ASoC: rsrc-card: use asoc_simple_card_clean_reference()" to the asoc tree Mark Brown
2016-08-10 20:03 ` Mark Brown
2016-05-20 10:07 ` [PATCH 47/49] ASoC: rsrc-card: rename rsrc-card to simple-dpcm-card phase1 Kuninori Morimoto
2016-05-20 10:07 ` Kuninori Morimoto
2016-05-20 10:08 ` [PATCH 48/49] ASoC: rsrc-card: rename rsrc-card to simple-dpcm-card phase2 Kuninori Morimoto
2016-05-20 10:08 ` Kuninori Morimoto
2016-05-20 10:09 ` [PATCH 49/49] ASoC: rsrc-card: rename rsrc-card to simple-dpcm-card phase3 Kuninori Morimoto
2016-05-20 10:09 ` Kuninori Morimoto
2016-05-23 10:58 ` [PATCH 00/49] ASoC: add simple-card-core and standardize "simple" card Mark Brown
2016-05-24 5:11 ` Kuninori Morimoto
2016-05-24 5:11 ` 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=87vb29qd2j.wl%kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=horms@verge.net.au \
--cc=lgirdwood@gmail.com \
--cc=linux-renesas-soc@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.