OSDN Git Service

ASoC: samsung: s3c24xx_simtec_hermes: use modern dai_link style
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 6 Jun 2019 04:10:16 +0000 (13:10 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 6 Jun 2019 20:30:41 +0000 (21:30 +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/samsung/s3c24xx_simtec_hermes.c

index e3528e7..ed0d1b8 100644 (file)
@@ -63,14 +63,17 @@ static int simtec_hermes_init(struct snd_soc_pcm_runtime *rtd)
        return 0;
 }
 
+SND_SOC_DAILINK_DEFS(tlv320aic33,
+       DAILINK_COMP_ARRAY(COMP_CPU("s3c24xx-iis")),
+       DAILINK_COMP_ARRAY(COMP_CODEC("tlv320aic3x-codec.0-001a",
+                                     "tlv320aic3x-hifi")),
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("s3c24xx-iis")));
+
 static struct snd_soc_dai_link simtec_dai_aic33 = {
        .name           = "tlv320aic33",
        .stream_name    = "TLV320AIC33",
-       .codec_name     = "tlv320aic3x-codec.0-001a",
-       .cpu_dai_name   = "s3c24xx-iis",
-       .codec_dai_name = "tlv320aic3x-hifi",
-       .platform_name  = "s3c24xx-iis",
        .init           = simtec_hermes_init,
+       SND_SOC_DAILINK_REG(tlv320aic33),
 };
 
 /* simtec audio machine driver */