From 953fa50f4f1c82fa90846863113790152d9c2131 Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Wed, 5 Aug 2020 02:07:32 +0100 Subject: [PATCH] v4.20: support snd_soc_dai_link_component style for platform commit e58f41e41185c6906bd11c73c4e76aa5fc3ea685 Author: Kuninori Morimoto Date: Fri Aug 31 03:10:33 2018 +0000 ASoC: simple-card: 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 for platform. --- seeed-voicecard.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/seeed-voicecard.c b/seeed-voicecard.c index 5436db3..6a23508 100644 --- a/seeed-voicecard.c +++ b/seeed-voicecard.c @@ -43,6 +43,7 @@ struct seeed_card_data { struct asoc_simple_dai cpu_dai; struct asoc_simple_dai codec_dai; struct snd_soc_dai_link_component codecs; /* single codec */ + struct snd_soc_dai_link_component platform; unsigned int mclk_fs; } *dai_props; unsigned int mclk_fs; @@ -589,6 +590,7 @@ static int seeed_voice_card_probe(struct platform_device *pdev) for (i = 0; i < num; i++) { dai_link[i].codecs = &dai_props[i].codecs; dai_link[i].num_codecs = 1; + dai_link[i].platforms = &dai_props[i].platform; } priv->dai_props = dai_props; @@ -610,6 +612,7 @@ static int seeed_voice_card_probe(struct platform_device *pdev) } else { struct seeed_card_info *cinfo; struct snd_soc_dai_link_component *codecs; + struct snd_soc_dai_link_component *platform; cinfo = dev->platform_data; if (!cinfo) { @@ -630,10 +633,12 @@ static int seeed_voice_card_probe(struct platform_device *pdev) codecs->name = cinfo->codec; codecs->dai_name = cinfo->codec_dai.name; + platform = dai_link->platforms; + platform->name = cinfo->platform; + priv->snd_card.name = (cinfo->card) ? cinfo->card : cinfo->name; dai_link->name = cinfo->name; dai_link->stream_name = cinfo->name; - dai_link->platforms->name = cinfo->platform; dai_link->cpus->dai_name = cinfo->cpu_dai.name; dai_link->dai_fmt = cinfo->daifmt; dai_link->init = asoc_simple_dai_init;