3 files changed, 34 insertions, 0 deletions

diff --git a/drivers/of/unittest-data/Makefile b/drivers/of/unittest-data/Makefile
index 013d85e694c6..166dbdbfd1c5 100644
--- a/drivers/of/unittest-data/Makefile
+++ b/drivers/of/unittest-data/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_OF_OVERLAY) += overlay.dtb.o \
                             overlay_12.dtb.o \
                             overlay_13.dtb.o \
                             overlay_15.dtb.o \
+                            overlay_bad_add_dup_node.dtb.o \
                             overlay_bad_phandle.dtb.o \
                             overlay_bad_symbol.dtb.o \
                             overlay_base.dtb.o
diff --git a/drivers/of/unittest-data/overlay_bad_add_dup_node.dts b/drivers/of/unittest-data/overlay_bad_add_dup_node.dts
new file mode 100644
index 000000000000..145dfc3b1024
--- /dev/null
+++ b/drivers/of/unittest-data/overlay_bad_add_dup_node.dts
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+/plugin/;
+
+/*
+ * &electric_1/motor-1 and &spin_ctrl_1 are the same node:
+ *   /testcase-data-2/substation@100/motor-1
+ *
+ * Thus the new node "controller" in each fragment will
+ * result in an attempt to add the same node twice.
+ * This will result in an error and the overlay apply
+ * will fail.
+ */
+
+&electric_1 {
+
+        motor-1 {
+                controller {
+                        power_bus = < 0x1 0x2 >;
+                };
+        };
+};
+
+&spin_ctrl_1 {
+                controller {
+                        power_bus_emergency = < 0x101 0x102 >;
+                };
+};
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 49ae2aa744d6..f82edf829f43 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -2161,6 +2161,7 @@ OVERLAY_INFO_EXTERN(overlay_11);
 OVERLAY_INFO_EXTERN(overlay_12);
 OVERLAY_INFO_EXTERN(overlay_13);
 OVERLAY_INFO_EXTERN(overlay_15);
+OVERLAY_INFO_EXTERN(overlay_bad_add_dup_node);
 OVERLAY_INFO_EXTERN(overlay_bad_phandle);
 OVERLAY_INFO_EXTERN(overlay_bad_symbol);
 
@@ -2183,6 +2184,7 @@ static struct overlay_info overlays[] = {
         OVERLAY_INFO(overlay_12, 0),
         OVERLAY_INFO(overlay_13, 0),
         OVERLAY_INFO(overlay_15, 0),
+        OVERLAY_INFO(overlay_bad_add_dup_node, -EINVAL),
         OVERLAY_INFO(overlay_bad_phandle, -EINVAL),
         OVERLAY_INFO(overlay_bad_symbol, -EINVAL),
         {}
@@ -2430,6 +2432,9 @@ static __init void of_unittest_overlay_high_level(void)
         unittest(overlay_data_apply("overlay", NULL),
                  "Adding overlay 'overlay' failed\n");
 
+        unittest(overlay_data_apply("overlay_bad_add_dup_node", NULL),
+                 "Adding overlay 'overlay_bad_add_dup_node' failed\n");
+
         unittest(overlay_data_apply("overlay_bad_phandle", NULL),
                  "Adding overlay 'overlay_bad_phandle' failed\n");