dm: core: Avoid creating a name property when unflattening

The current implementation creates a 'name' value for every node. This
is not needed for the latest device tree format, which includes a name in
the node header.

Adjust the code to point the name at the node header instead.

Also simplify ofnode_get_name(), now that we can rely on it to set the
name correctly. Update the comment to make it clear what name the root
node has.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index f9c9ca14a66334b5ae7d110e3624fd43484fd22a..154c7b2667021f7605e0c9b18256111c697c6e63 100644 (file)
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -356,7 +356,7 @@ const char *ofnode_get_name(ofnode node)
        }
 
        if (ofnode_is_np(node))
-               return strrchr(node.np->full_name, '/') + 1;
+               return node.np->name;
 
        return fdt_get_name(gd->fdt_blob, ofnode_to_offset(node), NULL);
 }

diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
index 9dcc1fed5ba68e6080f5fdb4e349d910f205cfd1..1e23a40c9958475622f59955575f2f321d51a18e 100644 (file)
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -466,7 +466,7 @@ ofnode ofnode_get_parent(ofnode node);
  * ofnode_get_name() - get the name of a node
  *
  * @node: valid node to look up
- * Return: name of node
+ * Return: name of node (for the root node this is "")
  */
 const char *ofnode_get_name(ofnode node);
 

diff --git a/lib/of_live.c b/lib/of_live.c
index 30cae9ab8815427d4bd4fb54b9220519a7b76a6e..1b5964d09a9dc137b1915adf3b981479183d8803 100644 (file)
--- a/lib/of_live.c
+++ b/lib/of_live.c
@@ -97,6 +97,10 @@ static void *unflatten_dt_node(const void *blob, void *mem, int *poffset,
                char *fn;
 
                fn = (char *)np + sizeof(*np);
+               if (new_format) {
+                       np->name = pathp;
+                       has_name = 1;
+               }
                np->full_name = fn;
                if (new_format) {
                        /* rebuild full path for new format */
@@ -202,7 +206,8 @@ static void *unflatten_dt_node(const void *blob, void *mem, int *poffset,
        }
        if (!dryrun) {
                *prev_pp = NULL;
-               np->name = of_get_property(np, "name", NULL);
+               if (!has_name)
+                       np->name = of_get_property(np, "name", NULL);
                np->type = of_get_property(np, "device_type", NULL);
 
                if (!np->name)