hs_jack_gpios);
 }
 
+SND_SOC_DAILINK_DEFS(baytrail,
+       DAILINK_COMP_ARRAY(COMP_CPU("baytrail-pcm-audio")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("i2c-193C9890:00", "HiFi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("baytrail-pcm-audio")));
+
 static struct snd_soc_dai_link byt_max98090_dais[] = {
        {
                .name = "Baytrail Audio",
                .stream_name = "Audio",
-               .cpu_dai_name = "baytrail-pcm-audio",
-               .codec_dai_name = "HiFi",
-               .codec_name = "i2c-193C9890:00",
-               .platform_name = "baytrail-pcm-audio",
                .init = byt_max98090_init,
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                           SND_SOC_DAIFMT_CBS_CFS,
+               SND_SOC_DAILINK_REG(baytrail),
        },
 };