Commit 1199dd99 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: atmel: tse850-pcm5142: use modern dai_link style

ASoC is now supporting modern style dai_link
(= snd_soc_dai_link_component) for CPU/Codec/Platform.
This patch switches to use it.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d83923c5
...@@ -294,13 +294,18 @@ static const struct snd_soc_dapm_route tse850_intercon[] = { ...@@ -294,13 +294,18 @@ static const struct snd_soc_dapm_route tse850_intercon[] = {
{ "DAC", NULL, "OUTL" }, { "DAC", NULL, "OUTL" },
}; };
SND_SOC_DAILINK_DEFS(pcm,
DAILINK_COMP_ARRAY(COMP_EMPTY()),
DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "pcm512x-hifi")),
DAILINK_COMP_ARRAY(COMP_EMPTY()));
static struct snd_soc_dai_link tse850_dailink = { static struct snd_soc_dai_link tse850_dailink = {
.name = "TSE-850", .name = "TSE-850",
.stream_name = "TSE-850-PCM", .stream_name = "TSE-850-PCM",
.codec_dai_name = "pcm512x-hifi",
.dai_fmt = SND_SOC_DAIFMT_I2S .dai_fmt = SND_SOC_DAIFMT_I2S
| SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFS, | SND_SOC_DAIFMT_CBM_CFS,
SND_SOC_DAILINK_REG(pcm),
}; };
static struct snd_soc_card tse850_card = { static struct snd_soc_card tse850_card = {
...@@ -331,8 +336,8 @@ static int tse850_dt_init(struct platform_device *pdev) ...@@ -331,8 +336,8 @@ static int tse850_dt_init(struct platform_device *pdev)
dev_err(&pdev->dev, "failed to get cpu dai\n"); dev_err(&pdev->dev, "failed to get cpu dai\n");
return -EINVAL; return -EINVAL;
} }
dailink->cpu_of_node = cpu_np; dailink->cpus->of_node = cpu_np;
dailink->platform_of_node = cpu_np; dailink->platforms->of_node = cpu_np;
of_node_put(cpu_np); of_node_put(cpu_np);
codec_np = of_parse_phandle(np, "axentia,audio-codec", 0); codec_np = of_parse_phandle(np, "axentia,audio-codec", 0);
...@@ -340,7 +345,7 @@ static int tse850_dt_init(struct platform_device *pdev) ...@@ -340,7 +345,7 @@ static int tse850_dt_init(struct platform_device *pdev)
dev_err(&pdev->dev, "failed to get codec info\n"); dev_err(&pdev->dev, "failed to get codec info\n");
return -EINVAL; return -EINVAL;
} }
dailink->codec_of_node = codec_np; dailink->codecs->of_node = codec_np;
of_node_put(codec_np); of_node_put(codec_np);
return 0; return 0;
......
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