Skip to content

Commit f8da001

Browse files
Jookiabroonie
authored andcommitted
ASoC: audio-graph-card2: Purge absent supplies for device tree nodes
The audio graph card doesn't mark its subnodes such as multi {}, dpcm {} and c2c {} as not requiring any suppliers. This causes a hang as Linux waits for these phantom suppliers to show up on boot. Make it clear these nodes have no suppliers. Example error message: [ 15.208558] platform 2034000.i2s: deferred probe pending: platform: wait for supplier /sound/multi [ 15.208584] platform sound: deferred probe pending: asoc-audio-graph-card2: parse error Signed-off-by: John Watts <contact@jookia.org> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://patch.msgid.link/20241108-graph_dt_fix-v1-1-173e2f9603d6@jookia.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 48b8653 commit f8da001

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

sound/soc/generic/audio-graph-card2.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,16 +270,19 @@ static enum graph_type __graph_get_type(struct device_node *lnk)
270270

271271
if (of_node_name_eq(np, GRAPH_NODENAME_MULTI)) {
272272
ret = GRAPH_MULTI;
273+
fw_devlink_purge_absent_suppliers(&np->fwnode);
273274
goto out_put;
274275
}
275276

276277
if (of_node_name_eq(np, GRAPH_NODENAME_DPCM)) {
277278
ret = GRAPH_DPCM;
279+
fw_devlink_purge_absent_suppliers(&np->fwnode);
278280
goto out_put;
279281
}
280282

281283
if (of_node_name_eq(np, GRAPH_NODENAME_C2C)) {
282284
ret = GRAPH_C2C;
285+
fw_devlink_purge_absent_suppliers(&np->fwnode);
283286
goto out_put;
284287
}
285288

0 commit comments

Comments
 (0)