]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: simple-card-utils.c: add missing dlc->of_node
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 4 Feb 2025 23:50:08 +0000 (23:50 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 Mar 2025 19:54:18 +0000 (12:54 -0700)
[ Upstream commit dabbd325b25edb5cdd99c94391817202dd54b651 ]

commit 90de551c1bf ("ASoC: simple-card-utils.c: enable multi Component
support") added muiti Component support, but was missing to add
dlc->of_node. Because of it, Sound device list will indicates strange
name if it was DPCM connection and driver supports dai->driver->dai_args,
like below

> aplay -l
card X: sndulcbmix [xxxx], device 0: fe.(null).rsnd-dai.0 (*) []
...                                     ^^^^^^

It will be fixed by this patch

> aplay -l
card X: sndulcbmix [xxxx], device 0: fe.sound@ec500000.rsnd-dai.0 (*) []
...                                     ^^^^^^^^^^^^^^

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Link: https://patch.msgid.link/87ikpp2rtb.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/generic/simple-card-utils.c

index fedae7f6f70cc52317af13ce8134a3d44d92f625..975ffd2cad292c623a4a3c38fb83014fd2a7982c 100644 (file)
@@ -1097,6 +1097,7 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep,
        args.np = ep;
        dai = snd_soc_get_dai_via_args(&args);
        if (dai) {
+               dlc->of_node  = node;
                dlc->dai_name = snd_soc_dai_name_get(dai);
                dlc->dai_args = snd_soc_copy_dai_args(dev, &args);
                if (!dlc->dai_args)