Merge tag 'fsnotify_for_v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / sound / soc / tegra / trimslice.c

diff --git a/sound/soc/tegra/trimslice.c b/sound/soc/tegra/trimslice.c
index 47ed87d..3f67ddd 100644 (file)
--- a/sound/soc/tegra/trimslice.c
+++ b/sound/soc/tegra/trimslice.c
@@ -77,14 +77,19 @@ static const struct snd_soc_dapm_route trimslice_audio_map[] = {
        {"RLINEIN", NULL, "Line In"},
 };
 
+SND_SOC_DAILINK_DEFS(single_dsp,
+       DAILINK_COMP_ARRAY(COMP_EMPTY()),
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "tlv320aic23-hifi")),
+       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
 static struct snd_soc_dai_link trimslice_tlv320aic23_dai = {
        .name = "TLV320AIC23",
        .stream_name = "AIC23",
-       .codec_dai_name = "tlv320aic23-hifi",
        .ops = &trimslice_asoc_ops,
        .dai_fmt = SND_SOC_DAIFMT_I2S |
                   SND_SOC_DAIFMT_NB_NF |
                   SND_SOC_DAIFMT_CBS_CFS,
+       SND_SOC_DAILINK_REG(single_dsp),
 };
 
 static struct snd_soc_card snd_soc_trimslice = {
@@ -115,26 +120,26 @@ static int tegra_snd_trimslice_probe(struct platform_device *pdev)
        card->dev = &pdev->dev;
        snd_soc_card_set_drvdata(card, trimslice);
 
-       trimslice_tlv320aic23_dai.codec_of_node = of_parse_phandle(np,
+       trimslice_tlv320aic23_dai.codecs->of_node = of_parse_phandle(np,
                        "nvidia,audio-codec", 0);
-       if (!trimslice_tlv320aic23_dai.codec_of_node) {
+       if (!trimslice_tlv320aic23_dai.codecs->of_node) {
                dev_err(&pdev->dev,
                        "Property 'nvidia,audio-codec' missing or invalid\n");
                ret = -EINVAL;
                goto err;
        }
 
-       trimslice_tlv320aic23_dai.cpu_of_node = of_parse_phandle(np,
+       trimslice_tlv320aic23_dai.cpus->of_node = of_parse_phandle(np,
                        "nvidia,i2s-controller", 0);
-       if (!trimslice_tlv320aic23_dai.cpu_of_node) {
+       if (!trimslice_tlv320aic23_dai.cpus->of_node) {
                dev_err(&pdev->dev,
                        "Property 'nvidia,i2s-controller' missing or invalid\n");
                ret = -EINVAL;
                goto err;
        }
 
-       trimslice_tlv320aic23_dai.platform_of_node =
-                       trimslice_tlv320aic23_dai.cpu_of_node;
+       trimslice_tlv320aic23_dai.platforms->of_node =
+                       trimslice_tlv320aic23_dai.cpus->of_node;
 
        ret = tegra_asoc_utils_init(&trimslice->util_data, &pdev->dev);
        if (ret)