Unverified Commit 868cdb46 authored Aug 31, 2018 by Kuninori Morimoto Committed by Mark Brown Aug 31, 2018

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



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>

parent daecf46e

include/sound/simple_card_utils.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ void asoc_simple_card_clk_disable(struct asoc_simple_dai *dai);
		&dai_link->codec_dai_name, \
		list_name, cells_name, NULL)
		#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, \
		NULL, list_name, cells_name, NULL)
		int asoc_simple_card_parse_dai(struct device_node *node,

sound/soc/generic/simple-card-utils.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -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)
		{
		/* Assumes platform == cpu */
		if (dai_link->platform) {
		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;

		}
		EXPORT_SYMBOL_GPL(asoc_simple_card_canonicalize_dailink);

Admin message