Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db2f3762 authored Feb 12, 2018 by Frank Rowand Committed by Frank Rowand Mar 04, 2018

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: Frank Rowand <frank.rowand@sony.com>

parent 93a60390

drivers/of/unittest-data/overlay.dts

+44 −57

Original line number	Diff line number	Diff line
		@@ -2,12 +2,8 @@
		/dts-v1/;
		/plugin/;

		/ {
		&electric_1 {

		fragment@0 {
		target = <&electric_1>;

		__overlay__ {
		status = "okay";

		hvac_2: hvac-large-1 {
		@@ -16,12 +12,9 @@
		cool-range = < 65 80 >;
		};
		};
		};

		fragment@1 {
		target = <&rides_1>;
		&rides_1 {

		__overlay__ {
		#address-cells = <1>;
		#size-cells = <1>;
		status = "okay";
		@@ -62,16 +55,10 @@
		};
		};
		};
		};

		fragment@2 {
		target = <&lights_2>;
		&lights_2 {

		__overlay__ {
		status = "okay";
		color = "purple", "white", "red", "green";
		rate = < 3 256 >;
		};
		};

		};

drivers/of/unittest-data/overlay_10.dts

+16 −23

Original line number	Diff line number	Diff line
		@@ -2,14 +2,10 @@
		/dts-v1/;
		/plugin/;

		/ {
		/* 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>;
		@@ -27,8 +23,5 @@
		status = "okay";
		reg = <1>;
		};

		};
		};
		};
		};

drivers/of/unittest-data/overlay_11.dts

+17 −23

Original line number	Diff line number	Diff line
		@@ -2,14 +2,10 @@
		/dts-v1/;
		/plugin/;

		/ {
		/* 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>;
		@@ -30,5 +26,3 @@

		};
		};
		};
		};

drivers/of/unittest-data/overlay_15.dts

+18 −23

Original line number	Diff line number	Diff line
		@@ -2,12 +2,9 @@
		/dts-v1/;
		/plugin/;

		/ {
		/* overlay_15 - mux overlay */

		fragment@0 {
		target-path = "/testcase-data/overlay-node/test-bus/i2c-test-bus";
		__overlay__ {
		&unittest_i2c_test_bus {
		#address-cells = <1>;
		#size-cells = <0>;
		test-unittest15 {
		@@ -31,5 +28,3 @@
		};
		};
		};
		};
		};

drivers/of/unittest-data/overlay_2.dts

+3 −8

Original line number	Diff line number	Diff line
		@@ -2,13 +2,8 @@
		/dts-v1/;
		/plugin/;

		/ {
		/* overlay_2 - enable using label */

		fragment@0 {
		target = <&unittest2>;
		__overlay__ {
		&unittest2 {
		status = "okay";
		};
		};
		};