OSDN Git Service

ASoC: ti: rx51: use snd_soc_dai_link_component for aux_dev
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 8 Aug 2019 05:54:30 +0000 (14:54 +0900)
committerMark Brown <broonie@kernel.org>
Fri, 9 Aug 2019 17:12:36 +0000 (18:12 +0100)
We can use snd_soc_dai_link_component to specify aux_dev.
Let's use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/87imr86w96.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/ti/rx51.c

index ccd0e8a..588f680 100644 (file)
@@ -319,12 +319,10 @@ static struct snd_soc_dai_link rx51_dai[] = {
 
 static struct snd_soc_aux_dev rx51_aux_dev[] = {
        {
-               .name = "TLV320AIC34b",
-               .codec_name = "tlv320aic3x-codec.2-0019",
+               .dlc = COMP_AUX("tlv320aic3x-codec.2-0019"),
        },
        {
-               .name = "TPA61320A2",
-               .codec_name = "tpa6130a2.2-0060",
+               .dlc = COMP_AUX("tpa6130a2.2-0060"),
        },
 };
 
@@ -397,8 +395,8 @@ static int rx51_soc_probe(struct platform_device *pdev)
                        dev_err(&pdev->dev, "Auxiliary Codec node is not provided\n");
                        return -EINVAL;
                }
-               rx51_aux_dev[0].codec_name = NULL;
-               rx51_aux_dev[0].codec_of_node = dai_node;
+               rx51_aux_dev[0].dlc.name = NULL;
+               rx51_aux_dev[0].dlc.of_node = dai_node;
                rx51_codec_conf[0].dev_name = NULL;
                rx51_codec_conf[0].of_node = dai_node;
 
@@ -407,8 +405,8 @@ static int rx51_soc_probe(struct platform_device *pdev)
                        dev_err(&pdev->dev, "Headphone amplifier node is not provided\n");
                        return -EINVAL;
                }
-               rx51_aux_dev[1].codec_name = NULL;
-               rx51_aux_dev[1].codec_of_node = dai_node;
+               rx51_aux_dev[1].dlc.name = NULL;
+               rx51_aux_dev[1].dlc.of_node = dai_node;
                rx51_codec_conf[1].dev_name = NULL;
                rx51_codec_conf[1].of_node = dai_node;
        }