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

ASoC: Intel: cht_bsw_rt5672: 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 avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 099cc658

sound/soc/intel/boards/cht_bsw_rt5672.c

+24 −15
Original line number Diff line number Diff line
@@ -295,32 +295,44 @@ static const struct snd_soc_ops cht_be_ssp2_ops = { 
	.hw_params = cht_aif1_hw_params,

};



SND_SOC_DAILINK_DEF(dummy,

	DAILINK_COMP_ARRAY(COMP_DUMMY()));



SND_SOC_DAILINK_DEF(media,

	DAILINK_COMP_ARRAY(COMP_CPU("media-cpu-dai")));



SND_SOC_DAILINK_DEF(deepbuffer,

	DAILINK_COMP_ARRAY(COMP_CPU("deepbuffer-cpu-dai")));



SND_SOC_DAILINK_DEF(ssp2_port,

	DAILINK_COMP_ARRAY(COMP_CPU("ssp2-port")));

SND_SOC_DAILINK_DEF(ssp2_codec,

	DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC5670:00",

				      "rt5670-aif1")));



SND_SOC_DAILINK_DEF(platform,

	DAILINK_COMP_ARRAY(COMP_PLATFORM("sst-mfld-platform")));



static struct snd_soc_dai_link cht_dailink[] = {

	/* Front End DAI links */

	[MERR_DPCM_AUDIO] = {

		.name = "Audio Port",

		.stream_name = "Audio",

		.cpu_dai_name = "media-cpu-dai",

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

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

		.nonatomic = true,

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.ops = &cht_aif1_ops,

		SND_SOC_DAILINK_REG(media, dummy, platform),

	},

	[MERR_DPCM_DEEP_BUFFER] = {

		.name = "Deep-Buffer Audio Port",

		.stream_name = "Deep-Buffer Audio",

		.cpu_dai_name = "deepbuffer-cpu-dai",

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

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

		.nonatomic = true,

		.dynamic = 1,

		.dpcm_playback = 1,

		.ops = &cht_aif1_ops,

		SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),

	},



	/* Back End DAI links */
@@ -328,17 +340,14 @@ static struct snd_soc_dai_link cht_dailink[] = { 
		/* SSP2 - Codec */

		.name = "SSP2-Codec",

		.id = 0,

		.cpu_dai_name = "ssp2-port",

		.platform_name = "sst-mfld-platform",

		.no_pcm = 1,

		.nonatomic = true,

		.codec_dai_name = "rt5670-aif1",

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

		.init = cht_codec_init,

		.be_hw_params_fixup = cht_codec_fixup,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.ops = &cht_be_ssp2_ops,

		SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),

	},

};
@@ -417,9 +426,9 @@ static int snd_cht_mc_probe(struct platform_device *pdev) 
			 "i2c-%s", acpi_dev_name(adev));

		put_device(&adev->dev);

		for (i = 0; i < ARRAY_SIZE(cht_dailink); i++) {

			if (!strcmp(cht_dailink[i].codec_name,

			if (!strcmp(cht_dailink[i].codecs->name,

				    RT5672_I2C_DEFAULT)) {

				cht_dailink[i].codec_name = drv->codec_name;

				cht_dailink[i].codecs->name = drv->codec_name;

				break;

			}

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE