Unverified Commit 01825274 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: pxa: magician: 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 76359b17

sound/soc/pxa/magician.c

+14 −8
Original line number Diff line number Diff line
@@ -290,24 +290,30 @@ static const struct snd_kcontrol_new uda1380_magician_controls[] = { 
};



/* 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[] = {

{

	.name = "uda1380",

	.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,

	SND_SOC_DAILINK_REG(playback),

},

{

	.name = "uda1380",

	.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,

	SND_SOC_DAILINK_REG(capture),

}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE