ASoC: Intel: skl_rt286: 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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c
index 0e1818dd4cc69fec726ae29ee97d9756bb925c06..1f47ac2f8add35603156402a0e36384d8829712b 100644 (file)
--- a/sound/soc/intel/boards/skl_rt286.c
+++ b/sound/soc/intel/boards/skl_rt286.c
@@ -291,18 +291,66 @@ static const struct snd_soc_ops skylake_dmic_ops = {
        .startup = skylake_dmic_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(deepbuffer,
+       DAILINK_COMP_ARRAY(COMP_CPU("Deepbuffer 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(COMP_CODEC("i2c-INT343A:00", "rt286-aif1")));
+
+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")));
+
 /* skylake digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link skylake_rt286_dais[] = {
        /* Front End DAI links */
        [SKL_DPCM_AUDIO_PB] = {
                .name = "Skl Audio Port",
                .stream_name = "Audio",
-               .cpu_dai_name = "System Pin",
-               .platform_name = "0000:00:1f.3",
                .nonatomic = 1,
                .dynamic = 1,
-               .codec_name = "snd-soc-dummy",
-               .codec_dai_name = "snd-soc-dummy-dai",
                .init = skylake_rt286_fe_init,
                .trigger = {
                        SND_SOC_DPCM_TRIGGER_POST,
@@ -310,100 +358,79 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
                },
                .dpcm_playback = 1,
                .ops = &skylake_rt286_fe_ops,
+               SND_SOC_DAILINK_REG(system, dummy, platform),
        },
        [SKL_DPCM_AUDIO_DB_PB] = {
                .name = "Skl Deepbuffer Port",
                .stream_name = "Deep Buffer Audio",
-               .cpu_dai_name = "Deepbuffer Pin",
-               .platform_name = "0000:00:1f.3",
                .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_playback = 1,
                .ops = &skylake_rt286_fe_ops,
-
+               SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
        },
        [SKL_DPCM_AUDIO_CP] = {
                .name = "Skl Audio Capture Port",
                .stream_name = "Audio Record",
-               .cpu_dai_name = "System Pin",
-               .platform_name = "0000:00:1f.3",
                .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 = &skylake_rt286_fe_ops,
+               SND_SOC_DAILINK_REG(system, dummy, platform),
        },
        [SKL_DPCM_AUDIO_REF_CP] = {
                .name = "Skl 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:1f.3",
                .init = NULL,
                .dpcm_capture = 1,
                .nonatomic = 1,
                .dynamic = 1,
+               SND_SOC_DAILINK_REG(reference, dummy, platform),
        },
        [SKL_DPCM_AUDIO_DMIC_CP] = {
                .name = "Skl 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 = &skylake_dmic_ops,
+               SND_SOC_DAILINK_REG(dmic, dummy, platform),
        },
        [SKL_DPCM_AUDIO_HDMI1_PB] = {
                .name = "Skl 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,
                .nonatomic = 1,
                .dynamic = 1,
+               SND_SOC_DAILINK_REG(hdmi1, dummy, platform),
        },
        [SKL_DPCM_AUDIO_HDMI2_PB] = {
                .name = "Skl 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,
                .nonatomic = 1,
                .dynamic = 1,
+               SND_SOC_DAILINK_REG(hdmi2, dummy, platform),
        },
        [SKL_DPCM_AUDIO_HDMI3_PB] = {
                .name = "Skl 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",
                .dpcm_playback = 1,
                .init = NULL,
                .nonatomic = 1,
                .dynamic = 1,
+               SND_SOC_DAILINK_REG(hdmi3, dummy, platform),
        },
 
        /* Back End DAI links */
@@ -411,11 +438,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
                /* SSP0 - Codec */
                .name = "SSP0-Codec",
                .id = 0,
-               .cpu_dai_name = "SSP0 Pin",
-               .platform_name = "0000:00:1f.3",
                .no_pcm = 1,
-               .codec_name = "i2c-INT343A:00",
-               .codec_dai_name = "rt286-aif1",
                .init = skylake_rt286_codec_init,
                .dai_fmt = SND_SOC_DAIFMT_I2S |
                        SND_SOC_DAIFMT_NB_NF |
@@ -425,51 +448,40 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
                .ops = &skylake_rt286_ops,
                .dpcm_playback = 1,
                .dpcm_capture = 1,
+               SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform),
        },
        {
                .name = "dmic01",
                .id = 1,
-               .cpu_dai_name = "DMIC01 Pin",
-               .codec_name = "dmic-codec",
-               .codec_dai_name = "dmic-hifi",
-               .platform_name = "0000:00:1f.3",
                .be_hw_params_fixup = skylake_dmic_fixup,
                .ignore_suspend = 1,
                .dpcm_capture = 1,
                .no_pcm = 1,
+               SND_SOC_DAILINK_REG(dmic01_pin, dmic_codec, platform),
        },
        {
                .name = "iDisp1",
                .id = 2,
-               .cpu_dai_name = "iDisp1 Pin",
-               .codec_name = "ehdaudio0D2",
-               .codec_dai_name = "intel-hdmi-hifi1",
-               .platform_name = "0000:00:1f.3",
                .init = skylake_hdmi_init,
                .dpcm_playback = 1,
                .no_pcm = 1,
+               SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
        },
        {
                .name = "iDisp2",
                .id = 3,
-               .cpu_dai_name = "iDisp2 Pin",
-               .codec_name = "ehdaudio0D2",
-               .codec_dai_name = "intel-hdmi-hifi2",
-               .platform_name = "0000:00:1f.3",
                .init = skylake_hdmi_init,
                .dpcm_playback = 1,
                .no_pcm = 1,
+               SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
        },
        {
                .name = "iDisp3",
                .id = 4,
-               .cpu_dai_name = "iDisp3 Pin",
-               .codec_name = "ehdaudio0D2",
-               .codec_dai_name = "intel-hdmi-hifi3",
-               .platform_name = "0000:00:1f.3",
                .init = skylake_hdmi_init,
                .dpcm_playback = 1,
                .no_pcm = 1,
+               SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
        },
 };