ASoC: Intel: bytcht_cx2072x: 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/bytcht_cx2072x.c b/sound/soc/intel/boards/bytcht_cx2072x.c
index 4b985b393daee215cb01ebacbd5b6fc8d366cb4c..54ac2fd419259abd636fa14d3b0937a7d080918f 100644 (file)
--- a/sound/soc/intel/boards/bytcht_cx2072x.c
+++ b/sound/soc/intel/boards/bytcht_cx2072x.c
@@ -150,41 +150,49 @@ static struct snd_soc_ops byt_cht_cx2072x_aif1_ops = {
        .startup = byt_cht_cx2072x_aif1_startup,
 };
 
+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,
+       DAILINK_COMP_ARRAY(COMP_CPU("ssp2-port")));
+
+SND_SOC_DAILINK_DEF(cx2072x,
+       DAILINK_COMP_ARRAY(COMP_CODEC("i2c-14F10720:00", "cx2072x-hifi")));
+
+SND_SOC_DAILINK_DEF(platform,
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("sst-mfld-platform")));
+
 static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = {
        [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 = &byt_cht_cx2072x_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 = &byt_cht_cx2072x_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 = "cx2072x-hifi",
-               .codec_name = "i2c-14F10720:00",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                              | SND_SOC_DAIFMT_CBS_CFS,
                .init = byt_cht_cx2072x_init,
@@ -192,6 +200,7 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = {
                .nonatomic = true,
                .dpcm_playback = 1,
                .dpcm_capture = 1,
+               SND_SOC_DAILINK_REG(ssp2, cx2072x, platform),
        },
 };
 
@@ -223,7 +232,7 @@ static int snd_byt_cht_cx2072x_probe(struct platform_device *pdev)
 
        /* fix index of codec dai */
        for (i = 0; i < ARRAY_SIZE(byt_cht_cx2072x_dais); i++) {
-               if (!strcmp(byt_cht_cx2072x_dais[i].codec_name,
+               if (!strcmp(byt_cht_cx2072x_dais[i].codecs->name,
                            "i2c-14F10720:00")) {
                        dai_index = i;
                        break;
@@ -236,7 +245,7 @@ static int snd_byt_cht_cx2072x_probe(struct platform_device *pdev)
                snprintf(codec_name, sizeof(codec_name), "i2c-%s",
                         acpi_dev_name(adev));
                put_device(&adev->dev);
-               byt_cht_cx2072x_dais[dai_index].codec_name = codec_name;
+               byt_cht_cx2072x_dais[dai_index].codecs->name = codec_name;
        }
 
        /* override plaform name, if required */