Commit 61c29313 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: fsl: pcm030-audio-fabric: 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 8a147e50
...@@ -23,20 +23,26 @@ struct pcm030_audio_data { ...@@ -23,20 +23,26 @@ struct pcm030_audio_data {
struct platform_device *codec_device; struct platform_device *codec_device;
}; };
SND_SOC_DAILINK_DEFS(analog,
DAILINK_COMP_ARRAY(COMP_CPU("mpc5200-psc-ac97.0")),
DAILINK_COMP_ARRAY(COMP_CODEC("wm9712-codec", "wm9712-hifi")),
DAILINK_COMP_ARRAY(COMP_EMPTY()));
SND_SOC_DAILINK_DEFS(iec958,
DAILINK_COMP_ARRAY(COMP_CPU("mpc5200-psc-ac97.1")),
DAILINK_COMP_ARRAY(COMP_CODEC("wm9712-codec", "wm9712-aux")),
DAILINK_COMP_ARRAY(COMP_EMPTY()));
static struct snd_soc_dai_link pcm030_fabric_dai[] = { static struct snd_soc_dai_link pcm030_fabric_dai[] = {
{ {
.name = "AC97.0", .name = "AC97.0",
.stream_name = "AC97 Analog", .stream_name = "AC97 Analog",
.codec_dai_name = "wm9712-hifi", SND_SOC_DAILINK_REG(analog),
.cpu_dai_name = "mpc5200-psc-ac97.0",
.codec_name = "wm9712-codec",
}, },
{ {
.name = "AC97.1", .name = "AC97.1",
.stream_name = "AC97 IEC958", .stream_name = "AC97 IEC958",
.codec_dai_name = "wm9712-aux", SND_SOC_DAILINK_REG(iec958),
.cpu_dai_name = "mpc5200-psc-ac97.1",
.codec_name = "wm9712-codec",
}, },
}; };
...@@ -76,7 +82,7 @@ static int pcm030_fabric_probe(struct platform_device *op) ...@@ -76,7 +82,7 @@ static int pcm030_fabric_probe(struct platform_device *op)
} }
for_each_card_prelinks(card, i, dai_link) for_each_card_prelinks(card, i, dai_link)
dai_link->platform_of_node = platform_np; dai_link->platforms->of_node = platform_np;
ret = request_module("snd-soc-wm9712"); ret = request_module("snd-soc-wm9712");
if (ret) if (ret)
......
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