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

Revert "asoc_simple_card_init_dai is not exported, but asoc_simple_dai_init is, and does more"

Browse source 
This reverts commit de22f92298.

That commit was wrong: seeed_priv_to_props() is not identical to simple_priv_props().

Conflicts:
	seeed-voicecard.c
This commit is contained in:
Hin-Tak Leung 2020-08-05 04:28:16 +01:00
parent c2f81c1f23
commit 2d08bb0b35
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
seeed-voicecard.c
View file

@ -304,6 +304,26 @@ static int asoc_simple_parse_dai(struct device_node *node,
return 0; return 0;
} }
static int seeed_voice_card_dai_init(struct snd_soc_pcm_runtime *rtd)
{
struct seeed_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
struct snd_soc_dai *codec = rtd->codec_dai;
struct snd_soc_dai *cpu = rtd->cpu_dai;
struct seeed_dai_props *dai_props =
seeed_priv_to_props(priv, rtd->num);
int ret;
ret = asoc_simple_init_dai(codec, &dai_props->codec_dai);
if (ret < 0)
return ret;
ret = asoc_simple_init_dai(cpu, &dai_props->cpu_dai);
if (ret < 0)
return ret;
return 0;
}
static int seeed_voice_card_dai_link_of(struct device_node *node, static int seeed_voice_card_dai_link_of(struct device_node *node,
struct seeed_card_data *priv, struct seeed_card_data *priv,
int idx, int idx,
@ -425,7 +445,7 @@ static int seeed_voice_card_dai_link_of(struct device_node *node,
goto dai_link_of_err; goto dai_link_of_err;
dai_link->ops = &seeed_voice_card_ops; dai_link->ops = &seeed_voice_card_ops;
dai_link->init = asoc_simple_dai_init; dai_link->init = seeed_voice_card_dai_init;
dev_dbg(dev, "\tname : %s\n", dai_link->stream_name); dev_dbg(dev, "\tname : %s\n", dai_link->stream_name);
dev_dbg(dev, "\tformat : %04x\n", dai_link->dai_fmt); dev_dbg(dev, "\tformat : %04x\n", dai_link->dai_fmt);
@ -652,7 +672,7 @@ static int seeed_voice_card_probe(struct platform_device *pdev)
dai_link->name = cinfo->name; dai_link->name = cinfo->name;
dai_link->stream_name = cinfo->name; dai_link->stream_name = cinfo->name;
dai_link->dai_fmt = cinfo->daifmt; dai_link->dai_fmt = cinfo->daifmt;
dai_link->init = asoc_simple_dai_init; dai_link->init = seeed_voice_card_dai_init;
memcpy(&priv->dai_props->cpu_dai, &cinfo->cpu_dai, memcpy(&priv->dai_props->cpu_dai, &cinfo->cpu_dai,
sizeof(priv->dai_props->cpu_dai)); sizeof(priv->dai_props->cpu_dai));
memcpy(&priv->dai_props->codec_dai, &cinfo->codec_dai, memcpy(&priv->dai_props->codec_dai, &cinfo->codec_dai,