scripts/dtc: Update to upstream version v1.7.0-95-gbcd02b523429

Some pending overlay additions need the graph check fix.

This adds the following commits from upstream:

bcd02b523429 fdtoverlay: remove wrong singular article in a comment
84b056a89d3c checks: relax graph checks for overlays

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

diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c
index 10fb63894369e7001f63ce9d360ade9bebaa0cd9..6e06aeab5503f78c8a969f8d1d0e96be7b91749e 100644 (file)
--- a/scripts/dtc/checks.c
+++ b/scripts/dtc/checks.c
@@ -1826,10 +1826,14 @@ static void check_graph_port(struct check *c, struct dt_info *dti,
        if (node->bus != &graph_port_bus)
                return;
 
+       check_graph_reg(c, dti, node);
+
+       /* skip checks below for overlays */
+       if (dti->dtsflags & DTSF_PLUGIN)
+               return;
+
        if (!strprefixeq(node->name, node->basenamelen, "port"))
                FAIL(c, dti, node, "graph port node name should be 'port'");
-
-       check_graph_reg(c, dti, node);
 }
 WARNING(graph_port, check_graph_port, NULL, &graph_nodes);
 
@@ -1864,11 +1868,15 @@ static void check_graph_endpoint(struct check *c, struct dt_info *dti,
        if (!node->parent || node->parent->bus != &graph_port_bus)
                return;
 
+       check_graph_reg(c, dti, node);
+
+       /* skip checks below for overlays */
+       if (dti->dtsflags & DTSF_PLUGIN)
+               return;
+
        if (!strprefixeq(node->name, node->basenamelen, "endpoint"))
                FAIL(c, dti, node, "graph endpoint node name should be 'endpoint'");
 
-       check_graph_reg(c, dti, node);
-
        remote_node = get_remote_endpoint(c, dti, node);
        if (!remote_node)
                return;

diff --git a/scripts/dtc/fdtoverlay.c b/scripts/dtc/fdtoverlay.c
index 4eba0460f24034262eae7c781698783d5399398e..699b4f61650231c7e35397d6d14005f8ad2fe062 100644 (file)
--- a/scripts/dtc/fdtoverlay.c
+++ b/scripts/dtc/fdtoverlay.c
@@ -48,7 +48,7 @@ static void *apply_one(char *base, const char *overlay, size_t *buf_len,
        int ret;
 
        /*
-        * We take a copies first, because a failed apply can trash
+        * We take copies first, because a failed apply can trash
         * both the base blob and the overlay
         */
        tmpo = xmalloc(fdt_totalsize(overlay));

diff --git a/scripts/dtc/version_gen.h b/scripts/dtc/version_gen.h
index 4c5e17639d2bfebe6d2e817a986e87522fc52ed2..bf81ce593685ced4c580b364ae277bb42006f832 100644 (file)
--- a/scripts/dtc/version_gen.h
+++ b/scripts/dtc/version_gen.h
@@ -1 +1 @@
-#define DTC_VERSION "DTC 1.7.0-g1df7b047"
+#define DTC_VERSION "DTC 1.7.0-gbcd02b52"