Skip to content

Commit 121b83e

Browse files
geerturobherring
authored andcommitted
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 50aafd6 ("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 db2f376 ("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>
1 parent eb38b95 commit 121b83e

4 files changed

Lines changed: 12 additions & 32 deletions

File tree

drivers/of/unittest-data/overlay_0.dtso

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22
/dts-v1/;
33
/plugin/;
44

5-
/ {
6-
/* overlay_0 - enable using absolute target path */
5+
/* overlay_0 - enable using absolute target path */
76

8-
fragment@0 {
9-
target-path = "/testcase-data/overlay-node/test-bus/test-unittest0";
10-
__overlay__ {
11-
status = "okay";
12-
};
13-
};
7+
&{/testcase-data/overlay-node/test-bus/test-unittest0} {
8+
status = "okay";
149
};

drivers/of/unittest-data/overlay_1.dtso

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22
/dts-v1/;
33
/plugin/;
44

5-
/ {
6-
/* overlay_1 - disable using absolute target path */
5+
/* overlay_1 - disable using absolute target path */
76

8-
fragment@0 {
9-
target-path = "/testcase-data/overlay-node/test-bus/test-unittest1";
10-
__overlay__ {
11-
status = "disabled";
12-
};
13-
};
7+
&{/testcase-data/overlay-node/test-bus/test-unittest1} {
8+
status = "disabled";
149
};

drivers/of/unittest-data/overlay_12.dtso

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22
/dts-v1/;
33
/plugin/;
44

5-
/ {
6-
/* overlay_12 - enable using absolute target path (i2c) */
5+
/* overlay_12 - enable using absolute target path (i2c) */
76

8-
fragment@0 {
9-
target-path = "/testcase-data/overlay-node/test-bus/i2c-test-bus/test-unittest12";
10-
__overlay__ {
11-
status = "okay";
12-
};
13-
};
7+
&{/testcase-data/overlay-node/test-bus/i2c-test-bus/test-unittest12} {
8+
status = "okay";
149
};

drivers/of/unittest-data/overlay_13.dtso

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22
/dts-v1/;
33
/plugin/;
44

5-
/ {
6-
/* overlay_13 - disable using absolute target path (i2c) */
5+
/* overlay_13 - disable using absolute target path (i2c) */
76

8-
fragment@0 {
9-
target-path = "/testcase-data/overlay-node/test-bus/i2c-test-bus/test-unittest13";
10-
__overlay__ {
11-
status = "disabled";
12-
};
13-
};
7+
&{/testcase-data/overlay-node/test-bus/i2c-test-bus/test-unittest13} {
8+
status = "disabled";
149
};

0 commit comments

Comments
 (0)