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

ASoC: Intel: kbl_rt5663_max98927: 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 168bfa96

sound/soc/intel/boards/kbl_rt5663_max98927.c

+85 −99
Original line number Diff line number Diff line
@@ -246,17 +246,6 @@ static struct snd_soc_codec_conf max98927_codec_conf[] = { 
	},

};



static struct snd_soc_dai_link_component max98927_codec_components[] = {

	{ /* Left */

		.name = MAXIM_DEV0_NAME,

		.dai_name = KBL_MAXIM_CODEC_DAI,

	},

	{ /* Right */

		.name = MAXIM_DEV1_NAME,

		.dai_name = KBL_MAXIM_CODEC_DAI,

	},

};



static int kabylake_rt5663_fe_init(struct snd_soc_pcm_runtime *rtd)

{

	int ret;
@@ -590,127 +579,163 @@ static struct snd_soc_ops skylake_refcap_ops = { 
	.startup = kabylake_refcap_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(system2,

	DAILINK_COMP_ARRAY(COMP_CPU("System Pin2")));



SND_SOC_DAILINK_DEF(echoref,

	DAILINK_COMP_ARRAY(COMP_CPU("Echoref 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(ssp0_pin,

	DAILINK_COMP_ARRAY(COMP_CPU("SSP0 Pin")));

SND_SOC_DAILINK_DEF(ssp0_codec,

	DAILINK_COMP_ARRAY(

	/* Left */	COMP_CODEC(MAXIM_DEV0_NAME, KBL_MAXIM_CODEC_DAI),

	/* Right */	COMP_CODEC(MAXIM_DEV1_NAME, KBL_MAXIM_CODEC_DAI)));



SND_SOC_DAILINK_DEF(ssp1_pin,

	DAILINK_COMP_ARRAY(COMP_CPU("SSP1 Pin")));

SND_SOC_DAILINK_DEF(ssp1_codec,

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

				      KBL_REALTEK_CODEC_DAI)));



SND_SOC_DAILINK_DEF(dmic01_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(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:1f.3")));



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

static struct snd_soc_dai_link kabylake_dais[] = {

	/* Front End DAI links */

	[KBL_DPCM_AUDIO_PB] = {

		.name = "Kbl Audio Port",

		.stream_name = "Audio",

		.cpu_dai_name = "System Pin",

		.platform_name = "0000:00:1f.3",

		.dynamic = 1,

		.codec_name = "snd-soc-dummy",

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

		.nonatomic = 1,

		.init = kabylake_rt5663_fe_init,

		.trigger = {

			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.dpcm_playback = 1,

		.ops = &kabylake_rt5663_fe_ops,

		SND_SOC_DAILINK_REG(system, dummy, platform),

	},

	[KBL_DPCM_AUDIO_CP] = {

		.name = "Kbl Audio Capture Port",

		.stream_name = "Audio Record",

		.cpu_dai_name = "System Pin",

		.platform_name = "0000:00:1f.3",

		.dynamic = 1,

		.codec_name = "snd-soc-dummy",

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

		.nonatomic = 1,

		.trigger = {

			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.dpcm_capture = 1,

		.ops = &kabylake_rt5663_fe_ops,

		SND_SOC_DAILINK_REG(system, dummy, platform),

	},

	[KBL_DPCM_AUDIO_HS_PB] = {

		.name = "Kbl Audio Headset Playback",

		.stream_name = "Headset Audio",

		.cpu_dai_name = "System Pin2",

		.codec_name = "snd-soc-dummy",

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

		.platform_name = "0000:00:1f.3",

		.dpcm_playback = 1,

		.nonatomic = 1,

		.dynamic = 1,

		SND_SOC_DAILINK_REG(system2, dummy, platform),

	},

	[KBL_DPCM_AUDIO_ECHO_REF_CP] = {

		.name = "Kbl Audio Echo Reference cap",

		.stream_name = "Echoreference Capture",

		.cpu_dai_name = "Echoref Pin",

		.codec_name = "snd-soc-dummy",

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

		.platform_name = "0000:00:1f.3",

		.init = NULL,

		.capture_only = 1,

		.nonatomic = 1,

		SND_SOC_DAILINK_REG(echoref, dummy, platform),

	},

	[KBL_DPCM_AUDIO_REF_CP] = {

		.name = "Kbl Audio Reference cap",

		.stream_name = "Wake on Voice",

		.cpu_dai_name = "Reference Pin",

		.codec_name = "snd-soc-dummy",

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

		.platform_name = "0000:00:1f.3",

		.init = NULL,

		.dpcm_capture = 1,

		.nonatomic = 1,

		.dynamic = 1,

		.ops = &skylake_refcap_ops,

		SND_SOC_DAILINK_REG(reference, dummy, platform),

	},

	[KBL_DPCM_AUDIO_DMIC_CP] = {

		.name = "Kbl 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:1f.3",

		.init = NULL,

		.dpcm_capture = 1,

		.nonatomic = 1,

		.dynamic = 1,

		.ops = &kabylake_dmic_ops,

		SND_SOC_DAILINK_REG(dmic, dummy, platform),

	},

	[KBL_DPCM_AUDIO_HDMI1_PB] = {

		.name = "Kbl 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:1f.3",

		.dpcm_playback = 1,

		.init = NULL,

		.trigger = {

			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.nonatomic = 1,

		.dynamic = 1,

		SND_SOC_DAILINK_REG(hdmi1, dummy, platform),

	},

	[KBL_DPCM_AUDIO_HDMI2_PB] = {

		.name = "Kbl 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:1f.3",

		.dpcm_playback = 1,

		.init = NULL,

		.trigger = {

			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.nonatomic = 1,

		.dynamic = 1,

		SND_SOC_DAILINK_REG(hdmi2, dummy, platform),

	},

	[KBL_DPCM_AUDIO_HDMI3_PB] = {

		.name = "Kbl 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:1f.3",

		.trigger = {

			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.dpcm_playback = 1,

		.init = NULL,

		.nonatomic = 1,

		.dynamic = 1,

		SND_SOC_DAILINK_REG(hdmi3, dummy, platform),

	},



	/* Back End DAI links */
@@ -718,11 +743,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { 
		/* SSP0 - Codec */

		.name = "SSP0-Codec",

		.id = 0,

		.cpu_dai_name = "SSP0 Pin",

		.platform_name = "0000:00:1f.3",

		.no_pcm = 1,

		.codecs = max98927_codec_components,

		.num_codecs = ARRAY_SIZE(max98927_codec_components),

		.dai_fmt = SND_SOC_DAIFMT_DSP_B |

			SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_CBS_CFS,
@@ -730,16 +751,13 @@ static struct snd_soc_dai_link kabylake_dais[] = { 
		.be_hw_params_fixup = kabylake_ssp_fixup,

		.dpcm_playback = 1,

		.ops = &kabylake_ssp0_ops,

		SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform),

	},

	{

		/* SSP1 - Codec */

		.name = "SSP1-Codec",

		.id = 1,

		.cpu_dai_name = "SSP1 Pin",

		.platform_name = "0000:00:1f.3",

		.no_pcm = 1,

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

		.codec_dai_name = KBL_REALTEK_CODEC_DAI,

		.init = kabylake_rt5663_max98927_codec_init,

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_CBS_CFS,
@@ -748,51 +766,40 @@ static struct snd_soc_dai_link kabylake_dais[] = { 
		.ops = &kabylake_rt5663_ops,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform),

	},

	{

		.name = "dmic01",

		.id = 2,

		.cpu_dai_name = "DMIC01 Pin",

		.codec_name = "dmic-codec",

		.codec_dai_name = "dmic-hifi",

		.platform_name = "0000:00:1f.3",

		.be_hw_params_fixup = kabylake_dmic_fixup,

		.ignore_suspend = 1,

		.dpcm_capture = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(dmic01_pin, 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:1f.3",

		.dpcm_playback = 1,

		.init = kabylake_hdmi1_init,

		.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:1f.3",

		.init = kabylake_hdmi2_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:1f.3",

		.init = kabylake_hdmi3_init,

		.dpcm_playback = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),

	},

};
@@ -801,58 +808,46 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = { 
	[KBL_DPCM_AUDIO_5663_PB] = {

		.name = "Kbl Audio Port",

		.stream_name = "Audio",

		.cpu_dai_name = "System Pin",

		.platform_name = "0000:00:1f.3",

		.dynamic = 1,

		.codec_name = "snd-soc-dummy",

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

		.nonatomic = 1,

		.trigger = {

			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.dpcm_playback = 1,

		.ops = &kabylake_rt5663_fe_ops,

		SND_SOC_DAILINK_REG(system, dummy, platform),

	},

	[KBL_DPCM_AUDIO_5663_CP] = {

		.name = "Kbl Audio Capture Port",

		.stream_name = "Audio Record",

		.cpu_dai_name = "System Pin",

		.platform_name = "0000:00:1f.3",

		.dynamic = 1,

		.codec_name = "snd-soc-dummy",

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

		.nonatomic = 1,

		.trigger = {

			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.dpcm_capture = 1,

		.ops = &kabylake_rt5663_fe_ops,

		SND_SOC_DAILINK_REG(system, dummy, platform),

	},

	[KBL_DPCM_AUDIO_5663_HDMI1_PB] = {

		.name = "Kbl 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:1f.3",

		.dpcm_playback = 1,

		.init = NULL,

		.trigger = {

			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.nonatomic = 1,

		.dynamic = 1,

		SND_SOC_DAILINK_REG(hdmi1, dummy, platform),

	},

	[KBL_DPCM_AUDIO_5663_HDMI2_PB] = {

		.name = "Kbl 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:1f.3",

		.dpcm_playback = 1,

		.init = NULL,

		.trigger = {

			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},

		.nonatomic = 1,

		.dynamic = 1,

		SND_SOC_DAILINK_REG(hdmi2, dummy, platform),

	},



	/* Back End DAI links */
@@ -860,11 +855,7 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = { 
		/* SSP1 - Codec */

		.name = "SSP1-Codec",

		.id = 0,

		.cpu_dai_name = "SSP1 Pin",

		.platform_name = "0000:00:1f.3",

		.no_pcm = 1,

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

		.codec_dai_name = KBL_REALTEK_CODEC_DAI,

		.init = kabylake_rt5663_codec_init,

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_CBS_CFS,
@@ -873,28 +864,23 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = { 
		.ops = &kabylake_rt5663_ops,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform),

	},

	{

		.name = "iDisp1",

		.id = 1,

		.cpu_dai_name = "iDisp1 Pin",

		.codec_name = "ehdaudio0D2",

		.codec_dai_name = "intel-hdmi-hifi1",

		.platform_name = "0000:00:1f.3",

		.dpcm_playback = 1,

		.init = kabylake_5663_hdmi1_init,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),

	},

	{

		.name = "iDisp2",

		.id = 2,

		.cpu_dai_name = "iDisp2 Pin",

		.codec_name = "ehdaudio0D2",

		.codec_dai_name = "intel-hdmi-hifi2",

		.platform_name = "0000:00:1f.3",

		.init = kabylake_5663_hdmi2_init,

		.dpcm_playback = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),

	},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE