From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>
Subject: [alsa-devel] [PATCH 01/15] ASoC: soc-core: support snd_soc_dai_link_component for codec_conf
Date: 12 Dec 2019 10:07:24 +0900 [thread overview]
Message-ID: <87o8wee4hf.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87pngue4ia.wl-kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To find codec_conf component, it is using dev_name, of_node.
But, we already has this kind of finding component method by
snd_soc_dai_link_component, and snd_soc_is_matching_component().
We shouldn't have duplicate implementation to do same things.
This patch adds snd_soc_dai_link_component support to find
codec_conf component.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
include/sound/soc.h | 3 +++
sound/soc/soc-core.c | 18 +++++++++++-------
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 82e6523..dab1212 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -949,6 +949,7 @@ struct snd_soc_dai_link {
#define COMP_CODEC(_name, _dai) { .name = _name, .dai_name = _dai, }
#define COMP_PLATFORM(_name) { .name = _name }
#define COMP_AUX(_name) { .name = _name }
+#define COMP_CODEC_CNF(_name) { .name = _name }
#define COMP_DUMMY() { .name = "snd-soc-dummy", .dai_name = "snd-soc-dummy-dai", }
extern struct snd_soc_dai_link_component null_dailink_component[0];
@@ -962,6 +963,8 @@ struct snd_soc_codec_conf {
const char *dev_name;
struct device_node *of_node;
+ struct snd_soc_dai_link_component dlc;
+
/*
* optional map of kcontrol, widget and path name prefixes that are
* associated per device
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index ee77db2..411b83b 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1185,12 +1185,16 @@ static void soc_set_name_prefix(struct snd_soc_card *card,
for (i = 0; i < card->num_configs; i++) {
struct snd_soc_codec_conf *map = &card->codec_conf[i];
- if (map->of_node && of_node != map->of_node)
- continue;
- if (map->dev_name && strcmp(component->name, map->dev_name))
- continue;
- component->name_prefix = map->name_prefix;
- return;
+ /* fixme */
+ if (map->dev_name)
+ map->dlc.name = map->dev_name;
+ if (map->of_node)
+ map->dlc.of_node = map->of_node;
+
+ if (snd_soc_is_matching_component(&map->dlc, component)) {
+ component->name_prefix = map->name_prefix;
+ return;
+ }
}
/*
@@ -2915,7 +2919,7 @@ void snd_soc_of_parse_node_prefix(struct device_node *np,
return;
}
- codec_conf->of_node = of_node;
+ codec_conf->dlc.of_node = of_node;
codec_conf->name_prefix = str;
}
EXPORT_SYMBOL_GPL(snd_soc_of_parse_node_prefix);
--
2.7.4
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2019-12-12 1:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-12 1:06 [alsa-devel] [PATCH 00/15] ASoC: soc-core cleanup step7 Kuninori Morimoto
2019-12-12 1:07 ` Kuninori Morimoto [this message]
2019-12-12 2:28 ` [alsa-devel] [PATCH 01/15] ASoC: soc-core: support snd_soc_dai_link_component for codec_conf Pierre-Louis Bossart
2019-12-12 2:41 ` Kuninori Morimoto
2019-12-12 1:07 ` [alsa-devel] [PATCH 02/15] ASoC: fsl: imx-audmix: use " Kuninori Morimoto
2019-12-12 1:07 ` [alsa-devel] [PATCH 03/15] ASoC: intel: kbl_da7219_max98927: " Kuninori Morimoto
2019-12-12 1:07 ` [alsa-devel] [PATCH 04/15] ASoC: intel: kbl_rt5663_max98927: " Kuninori Morimoto
2019-12-12 1:07 ` [alsa-devel] [PATCH 05/15] ASoC: intel: kbl_rt5663_rt5514_max98927: " Kuninori Morimoto
2019-12-12 1:08 ` [alsa-devel] [PATCH 06/15] ASoC: intel: skl_nau88l25_ssm4567: " Kuninori Morimoto
2019-12-12 1:08 ` [alsa-devel] [PATCH 07/15] ASoC: mediatek: mt8173-rt5650-rt5514: " Kuninori Morimoto
2019-12-12 1:08 ` [alsa-devel] [PATCH 08/15] ASoC: mediatek: mt8173-rt5650-rt5676: " Kuninori Morimoto
2019-12-12 1:08 ` [alsa-devel] [PATCH 09/15] ASoC: mediatek: mt8183-da7219-max98357: " Kuninori Morimoto
2019-12-12 1:08 ` [alsa-devel] [PATCH 10/15] ASoC: samsung: bells: " Kuninori Morimoto
2019-12-12 1:08 ` [alsa-devel] [PATCH 11/15] ASoC: samsung: lowland: " Kuninori Morimoto
2019-12-12 1:08 ` [alsa-devel] [PATCH 12/15] ASoC: samsung: neo1973_wm8753: " Kuninori Morimoto
2019-12-12 1:08 ` [alsa-devel] [PATCH 13/15] ASoC: samsung: speyside: " Kuninori Morimoto
2019-12-12 1:08 ` [alsa-devel] [PATCH 14/15] ASoC: ti: rx51: " Kuninori Morimoto
2019-12-12 1:08 ` [alsa-devel] [PATCH 15/15] ASoC: soc-core: remove legacy style of codec_conf 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=87o8wee4hf.wl-kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@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;
as well as URLs for NNTP newsgroup(s).