Commit c1cd1e01 authored Jul 19, 2017 by Frank Rowand Committed by Rob Herring Jul 20, 2017

of: overlay: correctly apply overlay node with unit-address



Correct existing node name detection when overlay node name has
a unit-address.

Expected test result is overlay will update the nodes and properties
for /testcase-data-2/fairway-1/ride@100/ after this commit.

Before this commit:

   Console error message near end of unittest:
      OF: Duplicate name in fairway-1, renamed to "ride@100#1"

   $ cd /proc/device-tree/testcase-data-2/fairway-1/
   $ # extra node: ride@100#1
   $ ls
   #address-cells  linux,phandle   phandle         ride@200
   #size-cells     name            ride@100        status
   compatible      orientation     ride@100#1
   $ cd /proc/device-tree/testcase-data-2/fairway-1/ride@100/
   $ ls track@30/incline-up
   ls: track@30/incline-up: No such file or directory
   $ ls track@40/incline-up
   ls: track@40/incline-up: No such file or directory

After this commit:

   Console error message no longer occurs

   $ cd /proc/device-tree/testcase-data-2/fairway-1/
   $ # no extra node: ride@100#1
   $ ls
   #address-cells  compatible      name            phandle         ride@200
   #size-cells     linux,phandle   orientation     ride@100        status
   $ cd /proc/device-tree/testcase-data-2/fairway-1/ride@100/
   $ ls track@30/incline-up
   track@30/incline-up
   $ ls track@40/incline-up
   track@40/incline-up

Signed-off-by: Frank Rowand <frank.rowand@sony.com>
Signed-off-by: Rob Herring <robh@kernel.org>

parent 60a0004c

drivers/of/overlay.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,10 @@ static int of_overlay_apply_single_device_node(struct of_overlay *ov,
		return -ENOMEM;

		/* NOTE: Multiple mods of created nodes not supported */
		tchild = of_get_child_by_name(target, cname);
		for_each_child_of_node(target, tchild)
		if (!of_node_cmp(cname, kbasename(tchild->full_name)))
		break;

		if (tchild != NULL) {
		/* new overlay phandle value conflicts with existing value */
		if (child->phandle)

Admin message