dm: core: Support copying properties with ofnode

Add a function to copy properties from one node to another.

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

diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index 39636a5a18c92794e435d81bac67c7228b492ca4..14bbfe723271b562669804aecbfa80afbe75e4d2 100644 (file)
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -1557,3 +1557,27 @@ int ofnode_add_subnode(ofnode node, const char *name, ofnode *subnodep)
 
        return ret;     /* 0 or -EEXIST */
 }
+
+int ofnode_copy_props(ofnode src, ofnode dst)
+{
+       struct ofprop prop;
+
+       ofnode_for_each_prop(prop, src) {
+               const char *name;
+               const char *val;
+               int len, ret;
+
+               val = ofprop_get_property(&prop, &name, &len);
+               if (!val) {
+                       log_debug("Cannot read prop (err=%d)\n", len);
+                       return log_msg_ret("get", -EINVAL);
+               }
+               ret = ofnode_write_prop(dst, name, val, len, true);
+               if (ret) {
+                       log_debug("Cannot write prop (err=%d)\n", ret);
+                       return log_msg_ret("wr", -EINVAL);
+               }
+       }
+
+       return 0;
+}

diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
index 5203045a58e7e35f7e34a75ed7544e1fe45b0811..7aae2c29ef1e5ac9b98b3375f844255dd7dcf7a6 100644 (file)
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -1505,4 +1505,20 @@ static inline const char *ofnode_conf_read_str(const char *prop_name)
  */
 int ofnode_add_subnode(ofnode parent, const char *name, ofnode *nodep);
 
+/**
+ * ofnode_copy_props() - copy all properties from one node to another
+ *
+ * Makes a copy of all properties from the source note in the destination node.
+ * Existing properties in the destination node remain unchanged, except that
+ * any with the same name are overwritten, including changing the size of the
+ * property.
+ *
+ * For livetree, properties are copied / allocated, so the source tree does not
+ * need to be present afterwards.
+ *
+ * @src: Source node to read properties from
+ * @dst: Destination node to write properties too
+ */
+int ofnode_copy_props(ofnode src, ofnode dst);
+
 #endif

diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c
index 69ffba06534bb69e1dba5cb8a1a4a6ffd4dd920c..41811ec3bb5e1b3fe26e2ca0df80bc482bf66096 100644 (file)
--- a/test/dm/ofnode.c
+++ b/test/dm/ofnode.c
@@ -1176,3 +1176,62 @@ static int dm_test_ofnode_too_many(struct unit_test_state *uts)
        return 0;
 }
 DM_TEST(dm_test_ofnode_too_many, UT_TESTF_SCAN_FDT);
+
+static int check_copy_props(struct unit_test_state *uts, ofnode src,
+                           ofnode dst)
+{
+       u32 reg[2], val;
+
+       ut_assertok(ofnode_copy_props(src, dst));
+
+       ut_assertok(ofnode_read_u32(dst, "ping-expect", &val));
+       ut_asserteq(3, val);
+
+       ut_asserteq_str("denx,u-boot-fdt-test",
+                       ofnode_read_string(dst, "compatible"));
+
+       /* check that a property with the same name is overwritten */
+       ut_assertok(ofnode_read_u32_array(dst, "reg", reg, ARRAY_SIZE(reg)));
+       ut_asserteq(3, reg[0]);
+       ut_asserteq(1, reg[1]);
+
+       /* reset the compatible so the live tree does not change */
+       ut_assertok(ofnode_write_string(dst, "compatible", "nothing"));
+
+       return 0;
+}
+
+static int dm_test_ofnode_copy_props(struct unit_test_state *uts)
+{
+       ofnode src, dst;
+
+       /*
+        * These nodes are chosen so that the src node is before the destination
+        * node in the tree. This doesn't matter with livetree, but with
+        * flattree any attempt to insert a property earlier in the tree will
+        * mess up the offsets after it.
+        */
+       src = ofnode_path("/b-test");
+       dst = ofnode_path("/some-bus");
+
+       ut_assertok(check_copy_props(uts, src, dst));
+
+       /* check a property that is in the destination already */
+       ut_asserteq_str("mux0", ofnode_read_string(dst, "mux-control-names"));
+
+       return 0;
+}
+DM_TEST(dm_test_ofnode_copy_props, UT_TESTF_SCAN_FDT);
+
+static int dm_test_ofnode_copy_props_ot(struct unit_test_state *uts)
+{
+       ofnode src, dst;
+       oftree otree = get_other_oftree(uts);
+
+       src = ofnode_path("/b-test");
+       dst = oftree_path(otree, "/node/subnode2");
+       ut_assertok(check_copy_props(uts, src, dst));
+
+       return 0;
+}
+DM_TEST(dm_test_ofnode_copy_props_ot, UT_TESTF_SCAN_FDT | UT_TESTF_OTHER_FDT);