From 29bf3d3b4842d7cf4aaf0b2557cf68e2812670a1 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Mon, 2 Sep 2019 17:45:49 +0800 Subject: ASoC: imx-ak4497: Fix compile issue with new dai link definition Fix compile issue with new dai link definition Signed-off-by: Shengjiu Wang --- sound/soc/fsl/imx-ak4497.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'sound/soc/fsl/imx-ak4497.c') diff --git a/sound/soc/fsl/imx-ak4497.c b/sound/soc/fsl/imx-ak4497.c index 9acfa84bf3d1..a4d24333026c 100644 --- a/sound/soc/fsl/imx-ak4497.c +++ b/sound/soc/fsl/imx-ak4497.c @@ -20,7 +20,6 @@ #include #include -#include "../codecs/ak4497.h" #include "fsl_sai.h" struct imx_ak4497_data { @@ -166,12 +165,17 @@ static struct snd_soc_ops imx_aif_ops = { .hw_params = imx_aif_hw_params, }; +SND_SOC_DAILINK_DEFS(hifi, + DAILINK_COMP_ARRAY(COMP_EMPTY()), + DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "ak4497-aif")), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + static struct snd_soc_dai_link imx_ak4497_dai = { .name = "ak4497", .stream_name = "Audio", - .codec_dai_name = "ak4497-aif", .ops = &imx_aif_ops, .playback_only = 1, + SND_SOC_DAILINK_REG(hifi), }; static int imx_ak4497_probe(struct platform_device *pdev) @@ -206,9 +210,9 @@ static int imx_ak4497_probe(struct platform_device *pdev) goto fail; } - imx_ak4497_dai.codec_of_node = codec_np; - imx_ak4497_dai.cpu_dai_name = dev_name(&cpu_pdev->dev); - imx_ak4497_dai.platform_of_node = cpu_np; + imx_ak4497_dai.codecs->of_node = codec_np; + imx_ak4497_dai.cpus->dai_name = dev_name(&cpu_pdev->dev); + imx_ak4497_dai.platforms->of_node = cpu_np; imx_ak4497_dai.playback_only = 1; priv->card.dai_link = &imx_ak4497_dai; -- cgit v1.2.3