[PATCH] of: dynamic: Avoid reversing sibling order

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Current implementation inserts nodes at the head of the list, resulting
in sibling order being reversed from the .dts file. Some drivers care
about the order and do not work properly. These changes add nodes at the
end of the list instead, preversing sibling order.

Signed-off-by: Stephen Gordon <gordoste@xxxxxxxxxxxx>
---

I ran across this issue using the ASoC audio_graph_card2 driver. Prior
to the fix, I needed to reverse sibling order in the .dts to make things
work. After the fix, it all works as expected.

Also, I noticed that drivers/of/fdt.c line 325-330 fix the same problem
for flattened device trees.


 drivers/of/dynamic.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c
index 0aba760f7577..57bea2d4af30 100644
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@ -222,8 +222,15 @@ static void __of_attach_node(struct device_node *np)
 	}
 
 	np->child = NULL;
-	np->sibling = np->parent->child;
-	np->parent->child = np;
+	np->sibling = NULL;
+	struct device_node *last_child = np->parent->child;
+	if (!last_child)
+		np->parent->child = np;
+	else {
+		while (last_child->sibling)
+			last_child = last_child->sibling;
+		last_child->sibling = np;
+	}
 	of_node_clear_flag(np, OF_DETACHED);
 	np->fwnode.flags |= FWNODE_FLAG_NOT_DEVICE;
 
-- 
2.39.5





[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]


  Powered by Linux