iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: pxa: magician: use modern dai_link style

Browse Source 
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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-06-06 13:11:51 +09:00 committed by Mark Brown
parent 76359b17c3
commit 018252749c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sound/soc/pxa/magician.c
View File

@ -290,24 +290,30 @@ static const struct snd_kcontrol_new uda1380_magician_controls[] = {
}; };
/* magician digital audio interface glue - connects codec <--> CPU */ /* magician digital audio interface glue - connects codec <--> CPU */
SND_SOC_DAILINK_DEFS(playback,
DAILINK_COMP_ARRAY(COMP_CPU("pxa-ssp-dai.0")),
DAILINK_COMP_ARRAY(COMP_CODEC("uda1380-codec.0-0018",
"uda1380-hifi-playback")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("pxa-pcm-audio")));
SND_SOC_DAILINK_DEFS(capture,
DAILINK_COMP_ARRAY(COMP_CPU("pxa2xx-i2s")),
DAILINK_COMP_ARRAY(COMP_CODEC("uda1380-codec.0-0018",
"uda1380-hifi-capture")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("pxa-pcm-audio")));
static struct snd_soc_dai_link magician_dai[] = { static struct snd_soc_dai_link magician_dai[] = {
{ {
.name = "uda1380", .name = "uda1380",
.stream_name = "UDA1380 Playback", .stream_name = "UDA1380 Playback",
.cpu_dai_name = "pxa-ssp-dai.0",
.codec_dai_name = "uda1380-hifi-playback",
.platform_name = "pxa-pcm-audio",
.codec_name = "uda1380-codec.0-0018",
.ops = &magician_playback_ops, .ops = &magician_playback_ops,
SND_SOC_DAILINK_REG(playback),
}, },
{ {
.name = "uda1380", .name = "uda1380",
.stream_name = "UDA1380 Capture", .stream_name = "UDA1380 Capture",
.cpu_dai_name = "pxa2xx-i2s",
.codec_dai_name = "uda1380-hifi-capture",
.platform_name = "pxa-pcm-audio",
.codec_name = "uda1380-codec.0-0018",
.ops = &magician_capture_ops, .ops = &magician_capture_ops,
SND_SOC_DAILINK_REG(capture),
} }
}; };