Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ASoC: amd: acp-rt5645: 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 48696d0a

sound/soc/amd/acp-rt5645.c

+13 −8
Original line number Diff line number Diff line
@@ -95,29 +95,34 @@ static struct snd_soc_ops cz_aif1_ops = { 
	.hw_params = cz_aif1_hw_params,

};



SND_SOC_DAILINK_DEF(designware1,

	DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.1.auto")));

SND_SOC_DAILINK_DEF(designware2,

	DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.2.auto")));



SND_SOC_DAILINK_DEF(codec,

	DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC5650:00", "rt5645-aif1")));



SND_SOC_DAILINK_DEF(platform,

	DAILINK_COMP_ARRAY(COMP_PLATFORM("acp_audio_dma.0.auto")));



static struct snd_soc_dai_link cz_dai_rt5650[] = {

	{

		.name = "amd-rt5645-play",

		.stream_name = "RT5645_AIF1",

		.platform_name = "acp_audio_dma.0.auto",

		.cpu_dai_name = "designware-i2s.1.auto",

		.codec_dai_name = "rt5645-aif1",

		.codec_name = "i2c-10EC5650:00",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

				| SND_SOC_DAIFMT_CBM_CFM,

		.init = cz_init,

		.ops = &cz_aif1_ops,

		SND_SOC_DAILINK_REG(designware1, codec, platform),

	},

	{

		.name = "amd-rt5645-cap",

		.stream_name = "RT5645_AIF1",

		.platform_name = "acp_audio_dma.0.auto",

		.cpu_dai_name = "designware-i2s.2.auto",

		.codec_dai_name = "rt5645-aif1",

		.codec_name = "i2c-10EC5650:00",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

				| SND_SOC_DAIFMT_CBM_CFM,

		.ops = &cz_aif1_ops,

		SND_SOC_DAILINK_REG(designware2, codec, platform),

	},

};