of: unittest-data: Convert remaining overlay DTS files to sugar syntax

Overlay syntactic sugar for generating target-path fragments is
supported by the version of dtc supplied with the kernel since commit
50aafd60898a8b3e ("scripts/dtc: Update to upstream version
v1.4.6-21-g84e414b0b5bc").  Hence convert the remaining unittest overlay
devicetree source files to sugar syntax, improving readability.

This completes the work started in commit db2f3762d609318e ("of: convert
unittest overlay devicetree source to sugar syntax").

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/9b5991c85e5a2a7cdf33a4e59b42ef98eaadd98a.1690533838.git.geert+renesas@glider.be
Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/drivers/of/unittest-data/overlay_0.dtso b/drivers/of/unittest-data/overlay_0.dtso
index ac0f9e0..bb46582 100644 (file)
--- a/drivers/of/unittest-data/overlay_0.dtso
+++ b/drivers/of/unittest-data/overlay_0.dtso
@@ -2,13 +2,8 @@
 /dts-v1/;
 /plugin/;
 
-/ {
-       /* overlay_0 - enable using absolute target path */
+/* overlay_0 - enable using absolute target path */
 
-       fragment@0 {
-               target-path = "/testcase-data/overlay-node/test-bus/test-unittest0";
-               __overlay__ {
-                       status = "okay";
-               };
-       };
+&{/testcase-data/overlay-node/test-bus/test-unittest0} {
+       status = "okay";
 };

diff --git a/drivers/of/unittest-data/overlay_1.dtso b/drivers/of/unittest-data/overlay_1.dtso
index e92a626..9c0fc8f 100644 (file)
--- a/drivers/of/unittest-data/overlay_1.dtso
+++ b/drivers/of/unittest-data/overlay_1.dtso
@@ -2,13 +2,8 @@
 /dts-v1/;
 /plugin/;
 
-/ {
-       /* overlay_1 - disable using absolute target path */
+/* overlay_1 - disable using absolute target path */
 
-       fragment@0 {
-               target-path = "/testcase-data/overlay-node/test-bus/test-unittest1";
-               __overlay__ {
-                       status = "disabled";
-               };
-       };
+&{/testcase-data/overlay-node/test-bus/test-unittest1} {
+       status = "disabled";
 };

diff --git a/drivers/of/unittest-data/overlay_12.dtso b/drivers/of/unittest-data/overlay_12.dtso
index ca3441e..8d50877 100644 (file)
--- a/drivers/of/unittest-data/overlay_12.dtso
+++ b/drivers/of/unittest-data/overlay_12.dtso
@@ -2,13 +2,8 @@
 /dts-v1/;
 /plugin/;
 
-/ {
-       /* overlay_12 - enable using absolute target path (i2c) */
+/* overlay_12 - enable using absolute target path (i2c) */
 
-       fragment@0 {
-               target-path = "/testcase-data/overlay-node/test-bus/i2c-test-bus/test-unittest12";
-               __overlay__ {
-                       status = "okay";
-               };
-       };
+&{/testcase-data/overlay-node/test-bus/i2c-test-bus/test-unittest12} {
+       status = "okay";
 };

diff --git a/drivers/of/unittest-data/overlay_13.dtso b/drivers/of/unittest-data/overlay_13.dtso
index 3c30dec..da200ae 100644 (file)
--- a/drivers/of/unittest-data/overlay_13.dtso
+++ b/drivers/of/unittest-data/overlay_13.dtso
@@ -2,13 +2,8 @@
 /dts-v1/;
 /plugin/;
 
-/ {
-       /* overlay_13 - disable using absolute target path (i2c) */
+/* overlay_13 - disable using absolute target path (i2c) */
 
-       fragment@0 {
-               target-path = "/testcase-data/overlay-node/test-bus/i2c-test-bus/test-unittest13";
-               __overlay__ {
-                       status = "disabled";
-               };
-       };
+&{/testcase-data/overlay-node/test-bus/i2c-test-bus/test-unittest13} {
+       status = "disabled";
 };