summaryrefslogtreecommitdiffstats
path: root/sound/soc/jz4740
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-06 06:16:26 +0200
committerMark Brown <broonie@kernel.org>2019-06-06 22:44:15 +0200
commit7c5cbcfe966b4952ab69a1f6c8f06806d9396e9d (patch)
treeac193ddbd6d50790a8031a2ee40bbf2ffa14b1d9 /sound/soc/jz4740
parentASoC: fsl: imx-audmix: use modern dai_link style (diff)
downloadlinux-7c5cbcfe966b4952ab69a1f6c8f06806d9396e9d.tar.xz
linux-7c5cbcfe966b4952ab69a1f6c8f06806d9396e9d.zip
ASoC: jz4740: qi_lb60: 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>
Diffstat (limited to 'sound/soc/jz4740')
-rw-r--r--sound/soc/jz4740/qi_lb60.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c
index 53586999fcaa..45bdcaf6da98 100644
--- a/sound/soc/jz4740/qi_lb60.c
+++ b/sound/soc/jz4740/qi_lb60.c
@@ -49,15 +49,17 @@ static const struct snd_soc_dapm_route qi_lb60_routes[] = {
{"Speaker", NULL, "ROUT"},
};
+SND_SOC_DAILINK_DEFS(hifi,
+ DAILINK_COMP_ARRAY(COMP_CPU("jz4740-i2s")),
+ DAILINK_COMP_ARRAY(COMP_CODEC("jz4740-codec", "jz4740-hifi")),
+ DAILINK_COMP_ARRAY(COMP_PLATFORM("jz4740-i2s")));
+
static struct snd_soc_dai_link qi_lb60_dai = {
.name = "jz4740",
.stream_name = "jz4740",
- .cpu_dai_name = "jz4740-i2s",
- .platform_name = "jz4740-i2s",
- .codec_dai_name = "jz4740-hifi",
- .codec_name = "jz4740-codec",
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBM_CFM,
+ SND_SOC_DAILINK_REG(hifi),
};
static struct snd_soc_card qi_lb60_card = {