dtoverlay: allow top-level phandles to optionally be preserved

Look for the 'dtoverlay,preserve-phandle' flag in the overlay and,
if it's present, keep and merge the phandle.

Author: compholio

dtmerge/dtoverlay.c

@@ -564,6 +564,7 @@ int dtoverlay_merge_fragment(DTBLOB_T *base_dtb, int target_off,
                                     int overlay_off, int depth)
 {
     int prop_off, subnode_off;
+    int preserve_phandle = 0;
     int err = 0;
 
     if (dtoverlay_debug_enabled)
@@ -578,6 +579,21 @@ int dtoverlay_merge_fragment(DTBLOB_T *base_dtb, int target_off,
                         overlay_path);
     }
 
+    // Check for a property flag to indicate preserving top-level phandles
+    for (prop_off = fdt_first_property_offset(overlay_dtb->fdt, overlay_off);
+         (prop_off >= 0) && (err == 0);
+         prop_off = fdt_next_property_offset(overlay_dtb->fdt, prop_off))
+    {
+
+        const char *prop_name;
+        int prop_len;
+
+        fdt_getprop_by_offset(overlay_dtb->fdt, prop_off, &prop_name, &prop_len);
+
+        if (strcmp(prop_name, "dtoverlay,preserve-phandle") == 0)
+            preserve_phandle = 1;
+    }
+
     // Merge each property of the node
     for (prop_off = fdt_first_property_offset(overlay_dtb->fdt, overlay_off);
          (prop_off >= 0) && (err == 0);
@@ -592,8 +608,13 @@ int dtoverlay_merge_fragment(DTBLOB_T *base_dtb, int target_off,
         prop_val = fdt_getprop_by_offset(overlay_dtb->fdt, prop_off,
                                          &prop_name, &prop_len);
 
-        /* Skip these system properties (only phandles in the first level) */
+        /* Skip these system properties */
         if ((strcmp(prop_name, "name") == 0) ||
+            (strcmp(prop_name, "dtoverlay,preserve-phandle") == 0))
+            continue;
+
+        /* Skip phandles in the first level, unless specifically requested */
+        if ((!preserve_phandle) &&
             ((depth == 0) && ((strcmp(prop_name, "phandle") == 0) ||
                               (strcmp(prop_name, "linux,phandle") == 0))))
             continue;