Unverified Commit 4185b95f authored by Sen Wang's avatar Sen Wang Committed by Mark Brown
Browse files

ASoC: simple-card-utils: fix graph_util_is_ports0() for DT overlays 



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: 92939252 ("ASoC: simple-card-utils: add asoc_graph_is_ports0()")
Signed-off-by: default avatarSen Wang <sen@ti.com>
Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/20260309042109.2576612-1-sen@ti.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 634672f9

sound/soc/generic/simple-card-utils.c

+8 −4
Original line number Diff line number Diff line
@@ -1039,10 +1039,14 @@ int graph_util_is_ports0(struct device_node *np) 
		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");

	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);