AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ASoC: soc-core: support snd_soc_dai_link_component for codec_conf

Browse Source 
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>
Link: https://lore.kernel.org/r/87lfrh59kj.wl-kuninori.morimoto.gx@renesas.com
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-12-13 09:54:36 +09:00 committed by Mark Brown
parent 57e960f002
commit c13493a246
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sound/soc.h
View File

@ -949,6 +949,7 @@ struct snd_soc_dai_link {
#define COMP_CODEC(_name, _dai) { .name = _name, .dai_name = _dai, } #define COMP_CODEC(_name, _dai) { .name = _name, .dai_name = _dai, }
#define COMP_PLATFORM(_name) { .name = _name } #define COMP_PLATFORM(_name) { .name = _name }
#define COMP_AUX(_name) { .name = _name } #define COMP_AUX(_name) { .name = _name }
#define COMP_CODEC_CONF(_name) { .name = _name }
#define COMP_DUMMY() { .name = "snd-soc-dummy", .dai_name = "snd-soc-dummy-dai", } #define COMP_DUMMY() { .name = "snd-soc-dummy", .dai_name = "snd-soc-dummy-dai", }
extern struct snd_soc_dai_link_component null_dailink_component[0]; extern struct snd_soc_dai_link_component null_dailink_component[0];
@ -962,6 +963,8 @@ struct snd_soc_codec_conf {
const char *dev_name; const char *dev_name;
struct device_node *of_node; struct device_node *of_node;
struct snd_soc_dai_link_component dlc;
/* /*
* optional map of kcontrol, widget and path name prefixes that are * optional map of kcontrol, widget and path name prefixes that are
* associated per device * associated per device

18
sound/soc/soc-core.c
View File

@ -1185,12 +1185,16 @@ static void soc_set_name_prefix(struct snd_soc_card *card,
for (i = 0; i < card->num_configs; i++) { for (i = 0; i < card->num_configs; i++) {
struct snd_soc_codec_conf *map = &card->codec_conf[i]; struct snd_soc_codec_conf *map = &card->codec_conf[i];
if (map->of_node && of_node != map->of_node) /* fixme */
continue; if (map->dev_name)
if (map->dev_name && strcmp(component->name, map->dev_name)) map->dlc.name = map->dev_name;
continue; if (map->of_node)
component->name_prefix = map->name_prefix; map->dlc.of_node = map->of_node;
return;
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; return;
} }
codec_conf->of_node = of_node; codec_conf->dlc.of_node = of_node;
codec_conf->name_prefix = str; codec_conf->name_prefix = str;
} }
EXPORT_SYMBOL_GPL(snd_soc_of_parse_node_prefix); EXPORT_SYMBOL_GPL(snd_soc_of_parse_node_prefix);