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

ASoC: Intel: cht_bsw_max98090_ti: 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 75909d7e

sound/soc/intel/boards/cht_bsw_max98090_ti.c

+20 −12
Original line number Diff line number Diff line
@@ -337,41 +337,48 @@ static struct snd_soc_aux_dev cht_max98090_headset_dev = { 
	.codec_name = "i2c-104C227E:00",

};



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-193C9890:00", "HiFi")));



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

	},

	/* back ends */

	{

		.name = "SSP2-Codec",

		.id = 0,

		.cpu_dai_name = "ssp2-port",

		.platform_name = "sst-mfld-platform",

		.no_pcm = 1,

		.codec_dai_name = "HiFi",

		.codec_name = "i2c-193C9890:00",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

					| SND_SOC_DAIFMT_CBS_CFS,

		.init = cht_codec_init,
@@ -379,6 +386,7 @@ static struct snd_soc_dai_link cht_dailink[] = { 
		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.ops = &cht_be_ssp2_ops,

		SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),

	},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE