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

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

sound/soc/intel/boards/cht_bsw_rt5645.c

+26 −17
Original line number Diff line number Diff line
@@ -425,48 +425,56 @@ 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-10EC5645:00", "rt5645-aif1")));



SND_SOC_DAILINK_DEF(platform,

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



static struct snd_soc_dai_link cht_dailink[] = {

	[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),

	},

	/* CODEC<->CODEC link */

	/* back ends */

	{

		.name = "SSP2-Codec",

		.id = 0,

		.cpu_dai_name = "ssp2-port",

		.platform_name = "sst-mfld-platform",

		.no_pcm = 1,

		.codec_dai_name = "rt5645-aif1",

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

		.init = cht_codec_init,

		.be_hw_params_fixup = cht_codec_fixup,

		.nonatomic = true,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.ops = &cht_be_ssp2_ops,

		SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),

	},

};
@@ -555,8 +563,9 @@ static int snd_cht_mc_probe(struct platform_device *pdev) 


	/* set correct codec name */

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

		if (!strcmp(card->dai_link[i].codec_name, "i2c-10EC5645:00")) {

			card->dai_link[i].codec_name = drv->codec_name;

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

			    "i2c-10EC5645:00")) {

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

			dai_index = i;

		}
@@ -566,7 +575,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) 
		snprintf(cht_rt5645_codec_name, sizeof(cht_rt5645_codec_name),

			 "i2c-%s", acpi_dev_name(adev));

		put_device(&adev->dev);

		cht_dailink[dai_index].codec_name = cht_rt5645_codec_name;

		cht_dailink[dai_index].codecs->name = cht_rt5645_codec_name;

	}



	/*
@@ -637,7 +646,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) 
			sizeof(cht_rt5645_codec_aif_name),

			"%s", "rt5645-aif2");



		cht_dailink[dai_index].codec_dai_name =

		cht_dailink[dai_index].codecs->dai_name =

			cht_rt5645_codec_aif_name;

	}
@@ -649,7 +658,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) 
			sizeof(cht_rt5645_cpu_dai_name),

			"%s", "ssp0-port");



		cht_dailink[dai_index].cpu_dai_name =

		cht_dailink[dai_index].cpus->dai_name =

			cht_rt5645_cpu_dai_name;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE