Commit 710af919 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: simple-card: support snd_soc_dai_link_component style for codec

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 for codec.

[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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e664de68
...@@ -20,6 +20,7 @@ struct simple_card_data { ...@@ -20,6 +20,7 @@ struct simple_card_data {
struct simple_dai_props { struct simple_dai_props {
struct asoc_simple_dai cpu_dai; struct asoc_simple_dai cpu_dai;
struct asoc_simple_dai codec_dai; struct asoc_simple_dai codec_dai;
struct snd_soc_dai_link_component codecs; /* single codec */
unsigned int mclk_fs; unsigned int mclk_fs;
} *dai_props; } *dai_props;
unsigned int mclk_fs; unsigned int mclk_fs;
...@@ -234,7 +235,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, ...@@ -234,7 +235,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
ret = asoc_simple_card_set_dailink_name(dev, dai_link, ret = asoc_simple_card_set_dailink_name(dev, dai_link,
"%s-%s", "%s-%s",
dai_link->cpu_dai_name, dai_link->cpu_dai_name,
dai_link->codec_dai_name); dai_link->codecs->dai_name);
if (ret < 0) if (ret < 0)
goto dai_link_of_err; goto dai_link_of_err;
...@@ -363,7 +364,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev) ...@@ -363,7 +364,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct snd_soc_card *card; struct snd_soc_card *card;
int num, ret; int num, ret, i;
/* Get the number of DAI links */ /* Get the number of DAI links */
if (np && of_get_child_by_name(np, PREFIX "dai-link")) if (np && of_get_child_by_name(np, PREFIX "dai-link"))
...@@ -381,6 +382,17 @@ static int asoc_simple_card_probe(struct platform_device *pdev) ...@@ -381,6 +382,17 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
if (!dai_props || !dai_link) if (!dai_props || !dai_link)
return -ENOMEM; return -ENOMEM;
/*
* Use snd_soc_dai_link_component instead of legacy style
* It is codec only. but cpu/platform will be supported in the future.
* see
* soc-core.c :: snd_soc_init_multicodec()
*/
for (i = 0; i < num; i++) {
dai_link[i].codecs = &dai_props[i].codecs;
dai_link[i].num_codecs = 1;
}
priv->dai_props = dai_props; priv->dai_props = dai_props;
priv->dai_link = dai_link; priv->dai_link = dai_link;
...@@ -403,6 +415,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev) ...@@ -403,6 +415,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
} else { } else {
struct asoc_simple_card_info *cinfo; struct asoc_simple_card_info *cinfo;
struct snd_soc_dai_link_component *codecs;
cinfo = dev->platform_data; cinfo = dev->platform_data;
if (!cinfo) { if (!cinfo) {
...@@ -419,13 +432,15 @@ static int asoc_simple_card_probe(struct platform_device *pdev) ...@@ -419,13 +432,15 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
codecs = dai_link->codecs;
codecs->name = cinfo->codec;
codecs->dai_name = cinfo->codec_dai.name;
card->name = (cinfo->card) ? cinfo->card : cinfo->name; card->name = (cinfo->card) ? cinfo->card : cinfo->name;
dai_link->name = cinfo->name; dai_link->name = cinfo->name;
dai_link->stream_name = cinfo->name; dai_link->stream_name = cinfo->name;
dai_link->platform_name = cinfo->platform; dai_link->platform_name = cinfo->platform;
dai_link->codec_name = cinfo->codec;
dai_link->cpu_dai_name = cinfo->cpu_dai.name; dai_link->cpu_dai_name = cinfo->cpu_dai.name;
dai_link->codec_dai_name = cinfo->codec_dai.name;
dai_link->dai_fmt = cinfo->daifmt; dai_link->dai_fmt = cinfo->daifmt;
dai_link->init = asoc_simple_card_dai_init; dai_link->init = asoc_simple_card_dai_init;
memcpy(&priv->dai_props->cpu_dai, &cinfo->cpu_dai, memcpy(&priv->dai_props->cpu_dai, &cinfo->cpu_dai,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment