diff options
| author | Shengjiu Wang <shengjiu.wang@nxp.com> | 2019-09-04 11:11:36 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-11-25 15:50:53 +0800 |
| commit | c8a38b48a0034d7c9e685fe486a8d88e12b1005a (patch) | |
| tree | f6071e41d861c8c8477ce2a27177894b33ed6e6c /sound/soc/fsl/imx-mqs.c | |
| parent | 78b719abec0c42bd2c067cc063a5f9295d738671 (diff) | |
ASoC: imx-mqs: Fix compile error
API change due to:
adb76b5b9c47 ("ASoC: soc-core: remove legacy style dai_link")
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Diffstat (limited to 'sound/soc/fsl/imx-mqs.c')
| -rw-r--r-- | sound/soc/fsl/imx-mqs.c | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/sound/soc/fsl/imx-mqs.c b/sound/soc/fsl/imx-mqs.c index df291a45d43d..6462003dc009 100644 --- a/sound/soc/fsl/imx-mqs.c +++ b/sound/soc/fsl/imx-mqs.c @@ -106,6 +106,21 @@ static int be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, return 0; } +SND_SOC_DAILINK_DEFS(hifi, + DAILINK_COMP_ARRAY(COMP_EMPTY()), + DAILINK_COMP_ARRAY(COMP_EMPTY()), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +SND_SOC_DAILINK_DEFS(hifi_fe, + DAILINK_COMP_ARRAY(COMP_EMPTY()), + DAILINK_COMP_ARRAY(COMP_DUMMY()), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +SND_SOC_DAILINK_DEFS(hifi_be, + DAILINK_COMP_ARRAY(COMP_EMPTY()), + DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "fsl-mqs-dai")), + DAILINK_COMP_ARRAY(COMP_DUMMY())); + static struct snd_soc_dai_link imx_mqs_dai[] = { { .name = "HiFi", @@ -113,23 +128,21 @@ static struct snd_soc_dai_link imx_mqs_dai[] = { .dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, .ops = &imx_mqs_ops, + SND_SOC_DAILINK_REG(hifi), }, { .name = "HiFi-ASRC-FE", .stream_name = "HiFi-ASRC-FE", - .codec_name = "snd-soc-dummy", - .codec_dai_name = "snd-soc-dummy-dai", .dynamic = 1, .ignore_pmdown_time = 1, .dpcm_playback = 1, .dpcm_capture = 0, .dpcm_merged_chan = 1, + SND_SOC_DAILINK_REG(hifi_fe), }, { .name = "HiFi-ASRC-BE", .stream_name = "HiFi-ASRC-BE", - .codec_dai_name = "fsl-mqs-dai", - .platform_name = "snd-soc-dummy", .dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, .no_pcm = 1, @@ -138,6 +151,7 @@ static struct snd_soc_dai_link imx_mqs_dai[] = { .dpcm_capture = 0, .ops = &imx_mqs_ops_be, .be_hw_params_fixup = be_hw_params_fixup, + SND_SOC_DAILINK_REG(hifi_be), }, }; @@ -202,21 +216,21 @@ static int imx_mqs_probe(struct platform_device *pdev) goto fail; } - imx_mqs_dai[0].codec_dai_name = "fsl-mqs-dai"; + imx_mqs_dai[0].codecs->dai_name = "fsl-mqs-dai"; if (!asrc_pdev) { - imx_mqs_dai[0].codec_of_node = codec_np; - imx_mqs_dai[0].cpu_dai_name = dev_name(&cpu_pdev->dev); - imx_mqs_dai[0].platform_of_node = cpu_np; + imx_mqs_dai[0].codecs->of_node = codec_np; + imx_mqs_dai[0].cpus->dai_name = dev_name(&cpu_pdev->dev); + imx_mqs_dai[0].platforms->of_node = cpu_np; snd_soc_card_imx_mqs.num_links = 1; } else { - imx_mqs_dai[0].codec_of_node = codec_np; - imx_mqs_dai[0].cpu_dai_name = dev_name(&cpu_pdev->dev); - imx_mqs_dai[0].platform_of_node = cpu_np; - imx_mqs_dai[1].cpu_of_node = asrc_np; - imx_mqs_dai[1].platform_of_node = asrc_np; - imx_mqs_dai[2].codec_of_node = codec_np; - imx_mqs_dai[2].cpu_dai_name = dev_name(&cpu_pdev->dev); + imx_mqs_dai[0].codecs->of_node = codec_np; + imx_mqs_dai[0].cpus->dai_name = dev_name(&cpu_pdev->dev); + imx_mqs_dai[0].platforms->of_node = cpu_np; + imx_mqs_dai[1].cpus->of_node = asrc_np; + imx_mqs_dai[1].platforms->of_node = asrc_np; + imx_mqs_dai[2].codecs->of_node = codec_np; + imx_mqs_dai[2].cpus->dai_name = dev_name(&cpu_pdev->dev); snd_soc_card_imx_mqs.num_links = 3; ret = of_property_read_u32(asrc_np, "fsl,asrc-rate", |