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

ASoC: samsung: speyside: 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 f1d26f2b

sound/soc/samsung/speyside.c

+16 −10
Original line number Diff line number Diff line
@@ -189,39 +189,45 @@ static const struct snd_soc_pcm_stream dsp_codec_params = { 
	.channels_max = 2,

};



SND_SOC_DAILINK_DEFS(cpu_dsp,

	DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s.0")),

	DAILINK_COMP_ARRAY(COMP_CODEC("spi0.0", "wm0010-sdi1")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s.0")));



SND_SOC_DAILINK_DEFS(dsp_codec,

	DAILINK_COMP_ARRAY(COMP_CPU("wm0010-sdi2")),

	DAILINK_COMP_ARRAY(COMP_CODEC("wm8996.1-001a", "wm8996-aif1")));



SND_SOC_DAILINK_DEFS(baseband,

	DAILINK_COMP_ARRAY(COMP_CPU("wm8996-aif2")),

	DAILINK_COMP_ARRAY(COMP_CODEC("wm1250-ev1.1-0027", "wm1250-ev1")));



static struct snd_soc_dai_link speyside_dai[] = {

	{

		.name = "CPU-DSP",

		.stream_name = "CPU-DSP",

		.cpu_dai_name = "samsung-i2s.0",

		.codec_dai_name = "wm0010-sdi1",

		.platform_name = "samsung-i2s.0",

		.codec_name = "spi0.0",

		.init = speyside_wm0010_init,

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

				| SND_SOC_DAIFMT_CBM_CFM,

		SND_SOC_DAILINK_REG(cpu_dsp),

	},

	{

		.name = "DSP-CODEC",

		.stream_name = "DSP-CODEC",

		.cpu_dai_name = "wm0010-sdi2",

		.codec_dai_name = "wm8996-aif1",

		.codec_name = "wm8996.1-001a",

		.init = speyside_wm8996_init,

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

				| SND_SOC_DAIFMT_CBM_CFM,

		.params = &dsp_codec_params,

		.ignore_suspend = 1,

		SND_SOC_DAILINK_REG(dsp_codec),

	},

	{

		.name = "Baseband",

		.stream_name = "Baseband",

		.cpu_dai_name = "wm8996-aif2",

		.codec_dai_name = "wm1250-ev1",

		.codec_name = "wm1250-ev1.1-0027",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

				| SND_SOC_DAIFMT_CBM_CFM,

		.ignore_suspend = 1,

		SND_SOC_DAILINK_REG(baseband),

	},

};