korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: simple-card-util: support snd_soc_dai_link_component style for platform

Browse Source 
Current ASoC is supporting snd_soc_dai_link_component for binding,
it is more useful than current legacy style.
Currently only codec is supporting it as multicodec (= codecs).
CPU will support multi style in the future.
We want to have it on Platform too in the future.

If all Codec/CPU/Platform are replaced into snd_soc_dai_link_component
style, we can remove legacy complex style.
This patch supports snd_soc_dai_link_component style
for simple-card-util for platform.

[current]
struct snd_soc_dai_link {
	...
	*cpu_name;
	*cpu_of_node;
	*cpu_dai_name;

	*codec_name;
	*codec_of_node;
	*codec_dai_name;
	*codecs;
	num_codecs;

	*platform_name;
	*platform_of_node;
	...
}

[in the future]
struct snd_soc_dai_link {
	...
	*cpus
	num_cpus;

	*codecs;
	num_codecs;

	*platform;
	...
}

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2018-08-31 03:10:20 +00:00 committed by Mark Brown
parent daecf46ee0
commit 868cdb4690
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/simple_card_utils.h
View File

@ -75,7 +75,7 @@ void asoc_simple_card_clk_disable(struct asoc_simple_dai *dai);
&dai_link->codec_dai_name, \ &dai_link->codec_dai_name, \
list_name, cells_name, NULL) list_name, cells_name, NULL)
#define asoc_simple_card_parse_platform(node, dai_link, list_name, cells_name) \ #define asoc_simple_card_parse_platform(node, dai_link, list_name, cells_name) \
asoc_simple_card_parse_dai(node, NULL, \ asoc_simple_card_parse_dai(node, dai_link->platform, \
&dai_link->platform_of_node, \ &dai_link->platform_of_node, \
NULL, list_name, cells_name, NULL) NULL, list_name, cells_name, NULL)
int asoc_simple_card_parse_dai(struct device_node *node, int asoc_simple_card_parse_dai(struct device_node *node,

11
sound/soc/generic/simple-card-utils.c
View File

@ -376,10 +376,15 @@ EXPORT_SYMBOL_GPL(asoc_simple_card_init_dai);
int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link) int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link)
{ {
/* Assumes platform == cpu */ /* Assumes platform == cpu */
if (!dai_link->platform_of_node) if (dai_link->platform) {
dai_link->platform_of_node = dai_link->cpu_of_node; if (!dai_link->platform->of_node)
dai_link->platform->of_node = dai_link->cpu_of_node;
} else {
if (!dai_link->platform_of_node)
dai_link->platform_of_node = dai_link->cpu_of_node;
}
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(asoc_simple_card_canonicalize_dailink); EXPORT_SYMBOL_GPL(asoc_simple_card_canonicalize_dailink);