From 37a37a6d1645da7a83957b358ef73857161f114f Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Fri, 24 Apr 2020 04:58:58 +0100 Subject: [PATCH] adjust for modern style dai_link In v5.3: commit f107294c6422e772773b53dbf802186175b6289e Author: Kuninori Morimoto Date: Thu Jun 6 13:07:35 2019 +0900 ASoC: simple-card: support snd_soc_dai_link_component style for cpu --- seeed-voicecard.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/seeed-voicecard.c b/seeed-voicecard.c index eaa65a7..61eb9ab 100644 --- a/seeed-voicecard.c +++ b/seeed-voicecard.c @@ -362,9 +362,9 @@ static int seeed_voice_card_dai_link_of(struct device_node *node, ret = asoc_simple_set_dailink_name(dev, dai_link, "%s-%s", - dai_link->cpu_dai_name, + dai_link->cpus->dai_name, #if _SINGLE_CODEC - dai_link->codec_dai_name + dai_link->codecs->dai_name #else dai_link->codecs[0].dai_name #endif @@ -378,11 +378,11 @@ static int seeed_voice_card_dai_link_of(struct device_node *node, dev_dbg(dev, "\tname : %s\n", dai_link->stream_name); dev_dbg(dev, "\tformat : %04x\n", dai_link->dai_fmt); dev_dbg(dev, "\tcpu : %s / %d\n", - dai_link->cpu_dai_name, + dai_link->cpus->dai_name, dai_props->cpu_dai.sysclk); dev_dbg(dev, "\tcodec : %s / %d\n", #if _SINGLE_CODEC - dai_link->codec_dai_name, + dai_link->codecs->dai_name, #else dai_link->codecs[0].dai_name, #endif @@ -567,10 +567,10 @@ static int seeed_voice_card_probe(struct platform_device *pdev) priv->snd_card.name = (cinfo->card) ? cinfo->card : cinfo->name; dai_link->name = cinfo->name; dai_link->stream_name = cinfo->name; - dai_link->platform_name = cinfo->platform; - dai_link->codec_name = cinfo->codec; - dai_link->cpu_dai_name = cinfo->cpu_dai.name; - dai_link->codec_dai_name = cinfo->codec_dai.name; + dai_link->platforms->name = cinfo->platform; + dai_link->codecs->name = cinfo->codec; + 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->init = asoc_simple_dai_init; memcpy(&priv->dai_props->cpu_dai, &cinfo->cpu_dai,