]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: simple-card-utils: fix graph_util_is_ports0() for DT overlays
authorSen Wang <sen@ti.com>
Mon, 9 Mar 2026 04:21:09 +0000 (23:21 -0500)
committerMark Brown <broonie@kernel.org>
Tue, 10 Mar 2026 01:02:43 +0000 (01:02 +0000)
graph_util_is_ports0() identifies DPCM front-end (ports@0) vs back-end
(ports@1) by calling of_get_child_by_name() to find the first "ports"
child and comparing pointers. This relies on child iteration order
matching DTS source order.

When the DPCM topology comes from a DT overlay, __of_attach_node()
inserts new children at the head of the sibling list, reversing the
order. of_get_child_by_name() then returns ports@1 instead of ports@0,
causing all front-end links to be classified as back-ends. The card
registers with no PCM devices.

Fix this by matching the unit address directly from the node name
instead of relying on sibling order.

Fixes: 92939252458f ("ASoC: simple-card-utils: add asoc_graph_is_ports0()")
Signed-off-by: Sen Wang <sen@ti.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/20260309042109.2576612-1-sen@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/generic/simple-card-utils.c

index bdc02e85b089fe208812f612f1c659e3bad5cdf1..9e5be0eaa77f35c28cf272b27c14a5007c98640c 100644 (file)
@@ -1038,11 +1038,15 @@ int graph_util_is_ports0(struct device_node *np)
        else
                port = np;
 
-       struct device_node *ports  __free(device_node) = of_get_parent(port);
-       struct device_node *top    __free(device_node) = of_get_parent(ports);
-       struct device_node *ports0 __free(device_node) = of_get_child_by_name(top, "ports");
+       struct device_node *ports __free(device_node) = of_get_parent(port);
+       const char *at = strchr(kbasename(ports->full_name), '@');
 
-       return ports0 == ports;
+       /*
+        * Since child iteration order may differ
+        * between a base DT and DT overlays,
+        * string match "ports" or "ports@0" in the node name instead.
+        */
+       return !at || !strcmp(at, "@0");
 }
 EXPORT_SYMBOL_GPL(graph_util_is_ports0);