scripts/dtc: Revert "yamltree: Ensure consistent bracketing of properties with phandles"

This reverts upstream commit 18d7b2f4ee45fec422b7d82bab0b3c762ee907e4. A
revert in upstream dtc is pending.

This commit didn't work for properties such as 'interrupt-map' that have
phandle in the middle of an entry. It would also not work for a 0 or -1
phandle value that acts as a NULL.

Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/scripts/dtc/yamltree.c b/scripts/dtc/yamltree.c
index 43ca869dd6a864853fce391bb02699dcd1201e3d..5b6ea8ea862f0dccb3e666f2fe1721be4549cdc0 100644 (file)
--- a/scripts/dtc/yamltree.c
+++ b/scripts/dtc/yamltree.c
@@ -138,27 +138,6 @@ static void yaml_propval(yaml_emitter_t *emitter, struct property *prop)
                (yaml_char_t *)YAML_SEQ_TAG, 1, YAML_FLOW_SEQUENCE_STYLE);
        yaml_emitter_emit_or_die(emitter, &event);
 
-       /* Ensure we have a type marker before any phandle */
-       for_each_marker(m) {
-               int last_offset = 0;
-               struct marker *type_m;
-
-               if (m->type >= TYPE_UINT8)
-                       last_offset = m->offset;
-
-               if (!(m->next && m->next->type == REF_PHANDLE &&
-                     last_offset < m->next->offset))
-                       continue;
-
-               type_m = xmalloc(sizeof(*type_m));
-               type_m->offset = m->next->offset;
-               type_m->type = TYPE_UINT32;
-               type_m->ref = NULL;
-               type_m->next = m->next;
-               m->next = type_m;
-       }
-
-       m = prop->val.markers;
        for_each_marker(m) {
                int chunk_len;
                char *data = &prop->val.val[m->offset];