ASoC: Intel: kbl_rt5663_rt5514_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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
index 879f14257a3ea4c8fae5eaa683c365e519ecfc17..a22749e489433b8f61c151300734fa28197157a7 100644 (file)
--- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
@@ -145,20 +145,6 @@ static struct snd_soc_codec_conf max98927_codec_conf[] = {
        },
 };
 
-static struct snd_soc_dai_link_component ssp0_codec_components[] = {
-       { /* Left */
-               .name = MAXIM_DEV0_NAME,
-               .dai_name = KBL_MAXIM_CODEC_DAI,
-       },
-       { /* Right */
-               .name = MAXIM_DEV1_NAME,
-               .dai_name = KBL_MAXIM_CODEC_DAI,
-       },
-       { /*dmic */
-               .name = RT5514_DEV_NAME,
-               .dai_name = KBL_REALTEK_DMIC_CODEC_DAI,
-       },
-};
 
 static int kabylake_rt5663_fe_init(struct snd_soc_pcm_runtime *rtd)
 {
@@ -430,108 +416,136 @@ static struct snd_soc_ops kabylake_dmic_ops = {
        .startup = kabylake_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(system2,
+       DAILINK_COMP_ARRAY(COMP_CPU("System Pin2")));
+
+SND_SOC_DAILINK_DEF(echoref,
+       DAILINK_COMP_ARRAY(COMP_CPU("Echoref Pin")));
+
+SND_SOC_DAILINK_DEF(spi_cpu,
+       DAILINK_COMP_ARRAY(COMP_CPU("spi-PRP0001:00")));
+SND_SOC_DAILINK_DEF(spi_platform,
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("spi-PRP0001:00")));
+
+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(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),
+       /* dmic */ COMP_CODEC(RT5514_DEV_NAME, KBL_REALTEK_DMIC_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(RT5663_DEV_NAME, KBL_REALTEK_CODEC_DAI)));
+
+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(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_RT5514_DSP] = {
                .name = "rt5514 dsp",
                .stream_name = "Wake on Voice",
-               .cpu_dai_name = "spi-PRP0001:00",
-               .platform_name = "spi-PRP0001:00",
-               .codec_name = "snd-soc-dummy",
-               .codec_dai_name = "snd-soc-dummy-dai",
+               SND_SOC_DAILINK_REG(spi_cpu, dummy, spi_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),
        },
        /* Back End DAI links */
        /* single Back end dai for both max speakers and dmic */
@@ -539,11 +553,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 = ssp0_codec_components,
-               .num_codecs = ARRAY_SIZE(ssp0_codec_components),
                .dai_fmt = SND_SOC_DAIFMT_DSP_B |
                        SND_SOC_DAIFMT_NB_NF |
                        SND_SOC_DAIFMT_CBS_CFS,
@@ -552,15 +562,12 @@ static struct snd_soc_dai_link kabylake_dais[] = {
                .dpcm_playback = 1,
                .dpcm_capture = 1,
                .ops = &kabylake_ssp0_ops,
+               SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform),
        },
        {
                .name = "SSP1-Codec",
                .id = 1,
-               .cpu_dai_name = "SSP1 Pin",
-               .platform_name = "0000:00:1f.3",
                .no_pcm = 1,
-               .codec_name = RT5663_DEV_NAME,
-               .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,
@@ -569,28 +576,23 @@ 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 = "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),
        },
 };