]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: fsl: mx27vis-aic32x4: use modern dai_link style
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 6 Jun 2019 04:14:44 +0000 (13:14 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 6 Jun 2019 20:41:37 +0000 (21:41 +0100)
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>
sound/soc/fsl/mx27vis-aic32x4.c

index 37a4520aef62f87d03de4fbfffb1b2b66ebe3cdc..38ac4a397742a8ca5c6e3807e5fa60b12e938fd7 100644 (file)
@@ -132,16 +132,19 @@ static const struct snd_soc_dapm_route aic32x4_dapm_routes[] = {
        {"IN3_L", NULL, "Mic Bias"},
 };
 
+SND_SOC_DAILINK_DEFS(hifi,
+       DAILINK_COMP_ARRAY(COMP_CPU("imx-ssi.0")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("tlv320aic32x4.0-0018",
+                                     "tlv320aic32x4-hifi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("imx-ssi.0")));
+
 static struct snd_soc_dai_link mx27vis_aic32x4_dai = {
        .name           = "tlv320aic32x4",
        .stream_name    = "TLV320AIC32X4",
-       .codec_dai_name = "tlv320aic32x4-hifi",
-       .platform_name  = "imx-ssi.0",
-       .codec_name     = "tlv320aic32x4.0-0018",
-       .cpu_dai_name   = "imx-ssi.0",
        .dai_fmt        = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF |
                          SND_SOC_DAIFMT_CBM_CFM,
        .ops            = &mx27vis_aic32x4_snd_ops,
+       SND_SOC_DAILINK_REG(hifi),
 };
 
 static struct snd_soc_card mx27vis_aic32x4 = {