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

ASoC: Intel: bdw-rt5677: 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 7ba06110

sound/soc/intel/boards/bdw-rt5677.c

+14 −8
Original line number Diff line number Diff line
@@ -257,16 +257,24 @@ static int bdw_rt5677_init(struct snd_soc_pcm_runtime *rtd) 
}



/* broadwell digital audio interface glue - connects codec <--> CPU */

SND_SOC_DAILINK_DEF(dummy,

	DAILINK_COMP_ARRAY(COMP_DUMMY()));



SND_SOC_DAILINK_DEF(fe,

	DAILINK_COMP_ARRAY(COMP_CPU("System Pin")));



SND_SOC_DAILINK_DEF(platform,

	DAILINK_COMP_ARRAY(COMP_PLATFORM("haswell-pcm-audio")));



SND_SOC_DAILINK_DEF(be,

	DAILINK_COMP_ARRAY(COMP_CODEC("i2c-RT5677CE:00", "rt5677-aif1")));



static struct snd_soc_dai_link bdw_rt5677_dais[] = {

	/* Front End DAI links */

	{

		.name = "System PCM",

		.stream_name = "System Playback/Capture",

		.cpu_dai_name = "System Pin",

		.platform_name = "haswell-pcm-audio",

		.dynamic = 1,

		.codec_name = "snd-soc-dummy",

		.codec_dai_name = "snd-soc-dummy-dai",

#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)

		.init = bdw_rt5677_rtd_init,

#endif
@@ -276,6 +284,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { 
		},

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		SND_SOC_DAILINK_REG(fe, dummy, platform),

	},



	/* Back End DAI links */
@@ -283,11 +292,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { 
		/* SSP0 - Codec */

		.name = "Codec",

		.id = 0,

		.cpu_dai_name = "snd-soc-dummy-dai",

		.platform_name = "snd-soc-dummy",

		.no_pcm = 1,

		.codec_name = "i2c-RT5677CE:00",

		.codec_dai_name = "rt5677-aif1",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_CBS_CFS,

		.ignore_suspend = 1,
@@ -297,6 +302,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { 
		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.init = bdw_rt5677_init,

		SND_SOC_DAILINK_REG(dummy, be, dummy),

	},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE