Commit cc7b2401 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: pxa: tosa: 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 0d246384
...@@ -182,24 +182,28 @@ static const struct snd_kcontrol_new tosa_controls[] = { ...@@ -182,24 +182,28 @@ static const struct snd_kcontrol_new tosa_controls[] = {
tosa_set_spk), tosa_set_spk),
}; };
SND_SOC_DAILINK_DEFS(ac97,
DAILINK_COMP_ARRAY(COMP_CPU("pxa2xx-ac97")),
DAILINK_COMP_ARRAY(COMP_CODEC("wm9712-codec", "wm9712-hifi")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("pxa-pcm-audio")));
SND_SOC_DAILINK_DEFS(ac97_aux,
DAILINK_COMP_ARRAY(COMP_CPU("pxa2xx-ac97-aux")),
DAILINK_COMP_ARRAY(COMP_CODEC("wm9712-codec", "wm9712-aux")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("pxa-pcm-audio")));
static struct snd_soc_dai_link tosa_dai[] = { static struct snd_soc_dai_link tosa_dai[] = {
{ {
.name = "AC97", .name = "AC97",
.stream_name = "AC97 HiFi", .stream_name = "AC97 HiFi",
.cpu_dai_name = "pxa2xx-ac97",
.codec_dai_name = "wm9712-hifi",
.platform_name = "pxa-pcm-audio",
.codec_name = "wm9712-codec",
.ops = &tosa_ops, .ops = &tosa_ops,
SND_SOC_DAILINK_REG(ac97),
}, },
{ {
.name = "AC97 Aux", .name = "AC97 Aux",
.stream_name = "AC97 Aux", .stream_name = "AC97 Aux",
.cpu_dai_name = "pxa2xx-ac97-aux",
.codec_dai_name = "wm9712-aux",
.platform_name = "pxa-pcm-audio",
.codec_name = "wm9712-codec",
.ops = &tosa_ops, .ops = &tosa_ops,
SND_SOC_DAILINK_REG(ac97_aux),
}, },
}; };
......
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