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

ASoC: Intel: bxt_rt298: 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 56b2f318

sound/soc/intel/boards/bxt_rt298.c

+77 −58
Original line number Diff line number Diff line
@@ -331,6 +331,64 @@ static const struct snd_soc_ops broxton_rt286_fe_ops = { 
	.startup = bxt_fe_startup,

};



SND_SOC_DAILINK_DEF(dummy,

	DAILINK_COMP_ARRAY(COMP_DUMMY()));



SND_SOC_DAILINK_DEF(system,

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



SND_SOC_DAILINK_DEF(reference,

	DAILINK_COMP_ARRAY(COMP_CPU("Reference Pin")));



SND_SOC_DAILINK_DEF(dmic,

	DAILINK_COMP_ARRAY(COMP_CPU("DMIC Pin")));



SND_SOC_DAILINK_DEF(hdmi1,

	DAILINK_COMP_ARRAY(COMP_CPU("HDMI1 Pin")));



SND_SOC_DAILINK_DEF(hdmi2,

	DAILINK_COMP_ARRAY(COMP_CPU("HDMI2 Pin")));



SND_SOC_DAILINK_DEF(hdmi3,

	DAILINK_COMP_ARRAY(COMP_CPU("HDMI3 Pin")));



SND_SOC_DAILINK_DEF(ssp5_pin,

	DAILINK_COMP_ARRAY(COMP_CPU("SSP5 Pin")));

SND_SOC_DAILINK_DEF(ssp5_codec,

	DAILINK_COMP_ARRAY(COMP_CODEC("i2c-INT343A:00",

				      "rt298-aif1")));



SND_SOC_DAILINK_DEF(dmic_pin,

	DAILINK_COMP_ARRAY(COMP_CPU("DMIC01 Pin")));



SND_SOC_DAILINK_DEF(dmic_codec,

	DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec",

				      "dmic-hifi")));



SND_SOC_DAILINK_DEF(dmic16k,

	DAILINK_COMP_ARRAY(COMP_CPU("DMIC16k Pin")));



SND_SOC_DAILINK_DEF(idisp1_pin,

	DAILINK_COMP_ARRAY(COMP_CPU("iDisp1 Pin")));

SND_SOC_DAILINK_DEF(idisp1_codec,

	DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2",

				      "intel-hdmi-hifi1")));



SND_SOC_DAILINK_DEF(idisp2_pin,

	DAILINK_COMP_ARRAY(COMP_CPU("iDisp2 Pin")));

SND_SOC_DAILINK_DEF(idisp2_codec,

	DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2",

				      "intel-hdmi-hifi2")));



SND_SOC_DAILINK_DEF(idisp3_pin,

	DAILINK_COMP_ARRAY(COMP_CPU("iDisp3 Pin")));

SND_SOC_DAILINK_DEF(idisp3_codec,

	DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2",

				      "intel-hdmi-hifi3")));



SND_SOC_DAILINK_DEF(platform,

	DAILINK_COMP_ARRAY(COMP_PLATFORM("0000:00:0e.0")));



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

static struct snd_soc_dai_link broxton_rt298_dais[] = {

	/* Front End DAI links */
@@ -338,107 +396,82 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { 
	{

		.name = "Bxt Audio Port",

		.stream_name = "Audio",

		.cpu_dai_name = "System Pin",

		.platform_name = "0000:00:0e.0",

		.nonatomic = 1,

		.dynamic = 1,

		.codec_name = "snd-soc-dummy",

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

		.init = broxton_rt298_fe_init,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.dpcm_playback = 1,

		.ops = &broxton_rt286_fe_ops,

		SND_SOC_DAILINK_REG(system, dummy, platform),

	},

	[BXT_DPCM_AUDIO_CP] =

	{

		.name = "Bxt Audio Capture Port",

		.stream_name = "Audio Record",

		.cpu_dai_name = "System Pin",

		.platform_name = "0000:00:0e.0",

		.nonatomic = 1,

		.dynamic = 1,

		.codec_name = "snd-soc-dummy",

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

		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.dpcm_capture = 1,

		.ops = &broxton_rt286_fe_ops,

		SND_SOC_DAILINK_REG(system, dummy, platform),

	},

	[BXT_DPCM_AUDIO_REF_CP] =

	{

		.name = "Bxt Audio Reference cap",

		.stream_name = "refcap",

		.cpu_dai_name = "Reference Pin",

		.codec_name = "snd-soc-dummy",

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

		.platform_name = "0000:00:0e.0",

		.init = NULL,

		.dpcm_capture = 1,

		.nonatomic = 1,

		.dynamic = 1,

		SND_SOC_DAILINK_REG(reference, dummy, platform),

	},

	[BXT_DPCM_AUDIO_DMIC_CP] =

	{

		.name = "Bxt Audio DMIC cap",

		.stream_name = "dmiccap",

		.cpu_dai_name = "DMIC Pin",

		.codec_name = "snd-soc-dummy",

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

		.platform_name = "0000:00:0e.0",

		.init = NULL,

		.dpcm_capture = 1,

		.nonatomic = 1,

		.dynamic = 1,

		.ops = &broxton_dmic_ops,

		SND_SOC_DAILINK_REG(dmic, dummy, platform),

	},

	[BXT_DPCM_AUDIO_HDMI1_PB] =

	{

		.name = "Bxt HDMI Port1",

		.stream_name = "Hdmi1",

		.cpu_dai_name = "HDMI1 Pin",

		.codec_name = "snd-soc-dummy",

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

		.platform_name = "0000:00:0e.0",

		.dpcm_playback = 1,

		.init = NULL,

		.nonatomic = 1,

		.dynamic = 1,

		SND_SOC_DAILINK_REG(hdmi1, dummy, platform),

	},

	[BXT_DPCM_AUDIO_HDMI2_PB] =

	{

		.name = "Bxt HDMI Port2",

		.stream_name = "Hdmi2",

		.cpu_dai_name = "HDMI2 Pin",

		.codec_name = "snd-soc-dummy",

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

		.platform_name = "0000:00:0e.0",

		.dpcm_playback = 1,

		.init = NULL,

		.nonatomic = 1,

		.dynamic = 1,

		SND_SOC_DAILINK_REG(hdmi2, dummy, platform),

	},

	[BXT_DPCM_AUDIO_HDMI3_PB] =

	{

		.name = "Bxt HDMI Port3",

		.stream_name = "Hdmi3",

		.cpu_dai_name = "HDMI3 Pin",

		.codec_name = "snd-soc-dummy",

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

		.platform_name = "0000:00:0e.0",

		.dpcm_playback = 1,

		.init = NULL,

		.nonatomic = 1,

		.dynamic = 1,

		SND_SOC_DAILINK_REG(hdmi3, dummy, platform),

	},

	/* Back End DAI links */

	{

		/* SSP5 - Codec */

		.name = "SSP5-Codec",

		.id = 0,

		.cpu_dai_name = "SSP5 Pin",

		.platform_name = "0000:00:0e.0",

		.no_pcm = 1,

		.codec_name = "i2c-INT343A:00",

		.codec_dai_name = "rt298-aif1",

		.init = broxton_rt298_codec_init,

		.dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF |

						SND_SOC_DAIFMT_CBS_CFS,
@@ -447,63 +480,49 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { 
		.ops = &broxton_rt298_ops,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform),

	},

	{

		.name = "dmic01",

		.id = 1,

		.cpu_dai_name = "DMIC01 Pin",

		.codec_name = "dmic-codec",

		.codec_dai_name = "dmic-hifi",

		.platform_name = "0000:00:0e.0",

		.be_hw_params_fixup = broxton_dmic_fixup,

		.ignore_suspend = 1,

		.dpcm_capture = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),

	},

	{

		.name = "dmic16k",

		.id = 2,

		.cpu_dai_name = "DMIC16k Pin",

		.codec_name = "dmic-codec",

		.codec_dai_name = "dmic-hifi",

		.platform_name = "0000:00:0e.0",

		.be_hw_params_fixup = broxton_dmic_fixup,

		.ignore_suspend = 1,

		.dpcm_capture = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform),

	},

	{

		.name = "iDisp1",

		.id = 3,

		.cpu_dai_name = "iDisp1 Pin",

		.codec_name = "ehdaudio0D2",

		.codec_dai_name = "intel-hdmi-hifi1",

		.platform_name = "0000:00:0e.0",

		.init = broxton_hdmi_init,

		.dpcm_playback = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),

	},

	{

		.name = "iDisp2",

		.id = 4,

		.cpu_dai_name = "iDisp2 Pin",

		.codec_name = "ehdaudio0D2",

		.codec_dai_name = "intel-hdmi-hifi2",

		.platform_name = "0000:00:0e.0",

		.init = broxton_hdmi_init,

		.dpcm_playback = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),

	},

	{

		.name = "iDisp3",

		.id = 5,

		.cpu_dai_name = "iDisp3 Pin",

		.codec_name = "ehdaudio0D2",

		.codec_dai_name = "intel-hdmi-hifi3",

		.platform_name = "0000:00:0e.0",

		.init = broxton_hdmi_init,

		.dpcm_playback = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),

	},

};
@@ -583,16 +602,16 @@ static int broxton_audio_probe(struct platform_device *pdev) 
	int i;



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

		if (!strncmp(card->dai_link[i].codec_name, "i2c-INT343A:00",

		if (!strncmp(card->dai_link[i].codecs->name, "i2c-INT343A:00",

			     I2C_NAME_SIZE)) {

			if (!strncmp(card->name, "broxton-rt298",

				     PLATFORM_NAME_SIZE)) {

				card->dai_link[i].name = "SSP5-Codec";

				card->dai_link[i].cpu_dai_name = "SSP5 Pin";

				card->dai_link[i].cpus->dai_name = "SSP5 Pin";

			} else if (!strncmp(card->name, "geminilake-rt298",

					    PLATFORM_NAME_SIZE)) {

				card->dai_link[i].name = "SSP2-Codec";

				card->dai_link[i].cpu_dai_name = "SSP2 Pin";

				card->dai_link[i].cpus->dai_name = "SSP2 Pin";

			}

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE