zymon/seeed-voicecard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

v4.20: support snd_soc_dai_link_component style for codec

Browse source 
commit 710af9196ce614ee02185c2ec55e617a71843183
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date:   Fri Aug 31 03:08:24 2018 +0000

    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.
This commit is contained in:
Hin-Tak Leung 2020-08-05 01:42:57 +01:00
parent 1046e30108
commit 4396e4f834
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
seeed-voicecard.c
View file

@ -42,6 +42,7 @@ struct seeed_card_data {
struct seeed_dai_props { struct seeed_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;
@ -561,7 +562,7 @@ static int seeed_voice_card_probe(struct platform_device *pdev)
struct seeed_dai_props *dai_props; struct seeed_dai_props *dai_props;
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
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"))
@ -579,6 +580,17 @@ static int seeed_voice_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;
@ -597,6 +609,7 @@ static int seeed_voice_card_probe(struct platform_device *pdev)
} }
} else { } else {
struct seeed_card_info *cinfo; struct seeed_card_info *cinfo;
struct snd_soc_dai_link_component *codecs;
cinfo = dev->platform_data; cinfo = dev->platform_data;
if (!cinfo) { if (!cinfo) {
@ -613,13 +626,15 @@ static int seeed_voice_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;
priv->snd_card.name = (cinfo->card) ? cinfo->card : cinfo->name; priv->snd_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->platforms->name = cinfo->platform; dai_link->platforms->name = cinfo->platform;
dai_link->codecs->name = cinfo->codec;
dai_link->cpus->dai_name = cinfo->cpu_dai.name; dai_link->cpus->dai_name = cinfo->cpu_dai.name;
dai_link->codecs->dai_name = cinfo->codec_dai.name;
dai_link->dai_fmt = cinfo->daifmt; dai_link->dai_fmt = cinfo->daifmt;
dai_link->init = asoc_simple_dai_init; dai_link->init = asoc_simple_dai_init;
memcpy(&priv->dai_props->cpu_dai, &cinfo->cpu_dai, memcpy(&priv->dai_props->cpu_dai, &cinfo->cpu_dai,