Skip to content

L
linux
Commit db2f3762 authored by Frank Rowand's avatar Frank Rowand Committed by Frank Rowand
Browse files
Options

of: convert unittest overlay devicetree source to sugar syntax 

The unittest-data overlays have been pulled into proper overlay
devicetree source files without changing their format.  The
next step is to convert them to use sugar syntax instead of
hand coding overlay fragments structure.

A few of the overlays can not be converted because they test
absolute target paths in the overlay fragment.  dtc does not
generate this type of target:
  overlay_0.dts
  overlay_1.dts
  overlay_12.dts
  overlay_13.dts

Two pre-existing unittest overlay devicetree source files are
also converted:
  overlay_bad_phandle.dts
  overlay_bad_symbol.dts
Signed-off-by: default avatarFrank Rowand <frank.rowand@sony.com>
parent 93a60390
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 233 deletions
drivers/of/unittest-data/overlay.dts
View file @ db2f3762
......@@ -2,76 +2,63 @@
/dts-v1/;
/plugin/;
/ {
&electric_1 {
fragment@0 {
target = <&electric_1>;
status = "okay";
__overlay__ {
status = "okay";
hvac_2: hvac-large-1 {
compatible = "ot,hvac-large";
heat-range = < 40 75 >;
cool-range = < 65 80 >;
};
};
hvac_2: hvac-large-1 {
compatible = "ot,hvac-large";
heat-range = < 40 75 >;
cool-range = < 65 80 >;
};
};
fragment@1 {
target = <&rides_1>;
__overlay__ {
#address-cells = <1>;
#size-cells = <1>;
status = "okay";
ride@100 {
#address-cells = <1>;
#size-cells = <1>;
track@30 {
incline-up = < 48 32 16 >;
};
&rides_1 {
track@40 {
incline-up = < 47 31 15 >;
};
};
#address-cells = <1>;
#size-cells = <1>;
status = "okay";
ride_200: ride@200 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "ot,ferris-wheel";
reg = < 0x00000200 0x100 >;
hvac-provider = < &hvac_2 >;
hvac-thermostat = < 27 32 > ;
hvac-zones = < 12 5 >;
hvac-zone-names = "operator", "snack-bar";
spin-controller = < &spin_ctrl_1 3 >;
spin-rph = < 30 >;
gondolas = < 16 >;
gondola-capacity = < 6 >;
ride@100 {
#address-cells = <1>;
#size-cells = <1>;
ride_200_left: track@10 {
reg = < 0x00000010 0x10 >;
};
track@30 {
incline-up = < 48 32 16 >;
};
ride_200_right: track@20 {
reg = < 0x00000020 0x10 >;
};
};
track@40 {
incline-up = < 47 31 15 >;
};
};
fragment@2 {
target = <&lights_2>;
ride_200: ride@200 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "ot,ferris-wheel";
reg = < 0x00000200 0x100 >;
hvac-provider = < &hvac_2 >;
hvac-thermostat = < 27 32 > ;
hvac-zones = < 12 5 >;
hvac-zone-names = "operator", "snack-bar";
spin-controller = < &spin_ctrl_1 3 >;
spin-rph = < 30 >;
gondolas = < 16 >;
gondola-capacity = < 6 >;
ride_200_left: track@10 {
reg = < 0x00000010 0x10 >;
};
__overlay__ {
status = "okay";
color = "purple", "white", "red", "green";
rate = < 3 256 >;
ride_200_right: track@20 {
reg = < 0x00000020 0x10 >;
};
};
};
&lights_2 {
status = "okay";
color = "purple", "white", "red", "green";
rate = < 3 256 >;
};
drivers/of/unittest-data/overlay_10.dts
View file @ db2f3762
......@@ -2,33 +2,26 @@
/dts-v1/;
/plugin/;
/ {
/* overlay_10 */
/* overlays 8, 9, 10, 11 application and removal in bad sequence */
/* overlay_10 */
/* overlays 8, 9, 10, 11 application and removal in bad sequence */
fragment@0 {
target-path = "/testcase-data/overlay-node/test-bus";
__overlay__ {
&unittest_test_bus {
/* suppress DTC warning */
#address-cells = <1>;
#size-cells = <0>;
/* suppress DTC warning */
#address-cells = <1>;
#size-cells = <0>;
test-unittest10 {
compatible = "unittest";
status = "okay";
reg = <10>;
test-unittest10 {
compatible = "unittest";
status = "okay";
reg = <10>;
#address-cells = <1>;
#size-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
test-unittest101 {
compatible = "unittest";
status = "okay";
reg = <1>;
};
};
test-unittest101 {
compatible = "unittest";
status = "okay";
reg = <1>;
};
};
};
drivers/of/unittest-data/overlay_11.dts
View file @ db2f3762
......@@ -2,33 +2,27 @@
/dts-v1/;
/plugin/;
/ {
/* overlay_11 */
/* overlays 8, 9, 10, 11 application and removal in bad sequence */
/* overlay_11 */
/* overlays 8, 9, 10, 11 application and removal in bad sequence */
fragment@0 {
target-path = "/testcase-data/overlay-node/test-bus";
__overlay__ {
&unittest_test_bus {
/* suppress DTC warning */
#address-cells = <1>;
#size-cells = <0>;
/* suppress DTC warning */
#address-cells = <1>;
#size-cells = <0>;
test-unittest11 {
compatible = "unittest";
status = "okay";
reg = <11>;
test-unittest11 {
compatible = "unittest";
status = "okay";
reg = <11>;
#address-cells = <1>;
#size-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
test-unittest111 {
compatible = "unittest";
status = "okay";
reg = <1>;
};
};
test-unittest111 {
compatible = "unittest";
status = "okay";
reg = <1>;
};
};
};
drivers/of/unittest-data/overlay_15.dts
View file @ db2f3762
......@@ -2,33 +2,28 @@
/dts-v1/;
/plugin/;
/ {
/* overlay_15 - mux overlay */
/* overlay_15 - mux overlay */
fragment@0 {
target-path = "/testcase-data/overlay-node/test-bus/i2c-test-bus";
__overlay__ {
#address-cells = <1>;
#size-cells = <0>;
test-unittest15 {
reg = <11>;
compatible = "unittest-i2c-mux";
status = "okay";
&unittest_i2c_test_bus {
#address-cells = <1>;
#size-cells = <0>;
test-unittest15 {
reg = <11>;
compatible = "unittest-i2c-mux";
status = "okay";
#address-cells = <1>;
#size-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
i2c@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
i2c@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
test-mux-dev {
reg = <32>;
compatible = "unittest-i2c-dev";
status = "okay";
};
};
test-mux-dev {
reg = <32>;
compatible = "unittest-i2c-dev";
status = "okay";
};
};
};
......
drivers/of/unittest-data/overlay_2.dts
View file @ db2f3762
......@@ -2,13 +2,8 @@
/dts-v1/;
/plugin/;
/ {
/* overlay_2 - enable using label */
/* overlay_2 - enable using label */
fragment@0 {
target = <&unittest2>;
__overlay__ {
status = "okay";
};
};
&unittest2 {
status = "okay";
};
drivers/of/unittest-data/overlay_3.dts
View file @ db2f3762
......@@ -2,13 +2,8 @@
/dts-v1/;
/plugin/;
/ {
/* overlay_3 - disable using label */
/* overlay_3 - disable using label */
fragment@0 {
target = <&unittest3>;
__overlay__ {
status = "disabled";
};
};
&unittest3 {
status = "disabled";
};
drivers/of/unittest-data/overlay_4.dts
View file @ db2f3762
......@@ -2,22 +2,17 @@
/dts-v1/;
/plugin/;
/ {
/* overlay_4 - test insertion of a full node */
/* overlay_4 - test insertion of a full node */
fragment@0 {
target = <&unittestbus>;
__overlay__ {
&unittest_test_bus {
/* suppress DTC warning */
#address-cells = <1>;
#size-cells = <0>;
/* suppress DTC warning */
#address-cells = <1>;
#size-cells = <0>;
test-unittest4 {
compatible = "unittest";
status = "okay";
reg = <4>;
};
};
test-unittest4 {
compatible = "unittest";
status = "okay";
reg = <4>;
};
};
drivers/of/unittest-data/overlay_5.dts
View file @ db2f3762
......@@ -2,13 +2,8 @@
/dts-v1/;
/plugin/;
/ {
/* overlay_5 - test overlay apply revert */
/* overlay_5 - test overlay apply revert */
fragment@0 {
target-path = "/testcase-data/overlay-node/test-bus/test-unittest5";
__overlay__ {
status = "okay";
};
};
&unittest5 {
status = "okay";
};
drivers/of/unittest-data/overlay_6.dts
View file @ db2f3762
......@@ -2,14 +2,9 @@
/dts-v1/;
/plugin/;
/ {
/* overlay_6 */
/* overlays 6, 7 application and removal in sequence */
/* overlay_6 */
/* overlays 6, 7 application and removal in sequence */
fragment@0 {
target-path = "/testcase-data/overlay-node/test-bus/test-unittest6";
__overlay__ {
status = "okay";
};
};
&unittest6 {
status = "okay";
};
drivers/of/unittest-data/overlay_7.dts
View file @ db2f3762
......@@ -2,14 +2,9 @@
/dts-v1/;
/plugin/;
/ {
/* overlay_7 */
/* overlays 6, 7 application and removal in sequence */
/* overlay_7 */
/* overlays 6, 7 application and removal in sequence */
fragment@0 {
target-path = "/testcase-data/overlay-node/test-bus/test-unittest7";
__overlay__ {
status = "okay";
};
};
&unittest7 {
status = "okay";
};
drivers/of/unittest-data/overlay_8.dts
View file @ db2f3762
......@@ -2,14 +2,9 @@
/dts-v1/;
/plugin/;
/ {
/* overlay_8 */
/* overlays 8, 9, 10, 11 application and removal in bad sequence */
/* overlay_8 */
/* overlays 8, 9, 10, 11 application and removal in bad sequence */
fragment@0 {
target-path = "/testcase-data/overlay-node/test-bus/test-unittest8";
__overlay__ {
status = "okay";
};
};
&unittest8 {
status = "okay";
};
drivers/of/unittest-data/overlay_9.dts
View file @ db2f3762
......@@ -2,14 +2,9 @@
/dts-v1/;
/plugin/;
/ {
/* overlay_9 */
/* overlays 8, 9, 10, 11 application and removal in bad sequence */
/* overlay_9 */
/* overlays 8, 9, 10, 11 application and removal in bad sequence */
fragment@0 {
target-path = "/testcase-data/overlay-node/test-bus/test-unittest8";
__overlay__ {
property-foo = "bar";
};
};
&unittest8 {
property-foo = "bar";
};
drivers/of/unittest-data/overlay_bad_phandle.dts
View file @ db2f3762
......@@ -2,20 +2,13 @@
/dts-v1/;
/plugin/;
/ {
fragment@0 {
target = <&electric_1>;
__overlay__ {
// This label should cause an error when the overlay
// is applied. There is already a phandle value
// in the base tree for motor-1.
spin_ctrl_1_conflict: motor-1 {
accelerate = < 3 >;
decelerate = < 5 >;
};
};
&electric_1 {
// This label should cause an error when the overlay
// is applied. There is already a phandle value
// in the base tree for motor-1.
spin_ctrl_1_conflict: motor-1 {
accelerate = < 3 >;
decelerate = < 5 >;
};
};
drivers/of/unittest-data/overlay_bad_symbol.dts
View file @ db2f3762
......@@ -2,22 +2,15 @@
/dts-v1/;
/plugin/;
/ {
&electric_1 {
fragment@0 {
target = <&electric_1>;
__overlay__ {
// This label should cause an error when the overlay
// is applied. There is already a symbol hvac_1
// in the base tree
hvac_1: hvac-medium-2 {
compatible = "ot,hvac-medium";
heat-range = < 50 75 >;
cool-range = < 60 80 >;
};
};
// This label should cause an error when the overlay
// is applied. There is already a symbol hvac_1
// in the base tree
hvac_1: hvac-medium-2 {
compatible = "ot,hvac-medium";
heat-range = < 50 75 >;
cool-range = < 60 80 >;
};
};
drivers/of/unittest-data/tests-overlay.dtsi
View file @ db2f3762
......@@ -5,7 +5,7 @@ testcase-data {
overlay-node {
/* test bus */
unittestbus: test-bus {
unittest_test_bus: test-bus {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
......@@ -70,7 +70,7 @@ unittest8: test-unittest8 {
reg = <8>;
};
i2c-test-bus {
unittest_i2c_test_bus: i2c-test-bus {
compatible = "unittest-i2c-bus";
status = "okay";
reg = <50>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7