Skip to contentSkip to conversation

of: unittest: let dtc generate __local_fixups__

PATCH In review Rob Herring 2 participants 4 messages Nov 16, 2017 Device tree

lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/2 of: unittest: let dtc generate __local_fixups__

Remove the manually added __local_fixups__ because dtc can now generate them. This also fixes a new warning in the process:

drivers/of/unittest-data/testcases.dtb: Warning (interrupts_extended_property): Could not get phandle node for /__local_fixups__/testcase-data/interrupts/interrupts-extended0:interrupts-extended(cell 3)

---
 drivers/of/unittest-data/testcases.dts | 56 ++--------------------------------
 1 file changed, 2 insertions(+), 54 deletions(-)
drivers/of/unittest-data/testcases.dts +2 -54
index 12f7c3d649c8..ac616ad18ea6 100644
@@ -1,4 +1,6 @@
 /dts-v1/;
+/plugin/;
+
 / {
 	testcase-data {
 		changeset {
@@ -23,57 +25,3 @@
  * The format of this data may be subject to change. For the time being consider
  * this a kernel-internal data format.
  */
-/ { __local_fixups__ {
-	testcase-data {
-		phandle-tests {
-			consumer-a {
-				phandle-list = <0x00000000 0x00000008
-						0x00000018 0x00000028
-						0x00000034 0x00000038>;
-				phandle-list-bad-args = <0x00000000 0x0000000c>;
-			};
-		};
-		interrupts {
-			intmap0 {
-				interrupt-map = <0x00000004 0x00000010
-						 0x00000024 0x00000034>;
-			};
-			intmap1 {
-				interrupt-map = <0x0000000c>;
-			};
-			interrupts0 {
-				interrupt-parent = <0x00000000>;
-			};
-			interrupts1 {
-				interrupt-parent = <0x00000000>;
-			};
-			interrupts-extended0 {
-				interrupts-extended = <0x00000000 0x00000008
-						       0x00000018 0x00000024
-						       0x0000002c 0x00000034
-						       0x0000003c>;
-			};
-		};
-		testcase-device1 {
-			interrupt-parent = <0x00000000>;
-		};
-		testcase-device2 {
-			interrupt-parent = <0x00000000>;
-		};
-		overlay2 {
-			fragment@0 {
-				target = <0x00000000>;
-			};
-		};
-		overlay3 {
-			fragment@0 {
-				target = <0x00000000>;
-			};
-		};
-		overlay4 {
-			fragment@0 {
-				target = <0x00000000>;
-			};
-		};
-	};
-}; };
Signature · 6 lines
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
author maintainer
#1 lore raw

PATCH 2/2 of: unittest: disable interrupts_property warning

The testcases.dts has purposely bad data which now generates a dtc warning:

drivers/of/unittest-data/testcases.dtb: Warning (interrupts_property): interrupts size is (4), expected multiple of 8 in /testcase-data/testcase-device2

Disable this warning for now. The proper solution is to split the unit tests into good and bad data.

---
 drivers/of/unittest-data/Makefile | 1 +
 1 file changed, 1 insertion(+)
drivers/of/unittest-data/Makefile +1 -0
index 2d135fba94c1..84b3bc44c0b4 100644
@@ -1,3 +1,4 @@
+DTC_FLAGS_testcases := -Wno-interrupts_property
 obj-y += testcases.dtb.o
 
 targets += testcases.dtb testcases.dtb.S
Signature · 6 lines
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#2 lore raw
In reply to Rob Herring
Quoted 22 lines · Rob Herring

Remove the manually added __local_fixups__ because dtc can now generate them. This also fixes a new warning in the process:

drivers/of/unittest-data/testcases.dtb: Warning (interrupts_extended_property): Could not get phandle node for /__local_fixups__/testcase-data/interrupts/interrupts-extended0:interrupts-extended(cell 3)

---
 drivers/of/unittest-data/testcases.dts | 56 ++--------------------------------
 1 file changed, 2 insertions(+), 54 deletions(-)
drivers/of/unittest-data/testcases.dts +2 -0
index 12f7c3d649c8..ac616ad18ea6 100644
@@ -1,4 +1,6 @@
 /dts-v1/;
+/plugin/;
+
 / {
 	testcase-data {
 		changeset {

drivers/of/unittest-data/testcases.dts line 29

Quoted 7 lines
drivers/of/unittest-data/testcases.dts +0 -4
@@ -23,57 +25,3 @@
  * The format of this data may be subject to change. For the time being consider
  * this a kernel-internal data format.
  */
-/ { __local_fixups__ {
-	testcase-data {
-		phandle-tests {
-			consumer-a {

< snip >

You should also delete the comment immediately above that describes the removed lines. --
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

author maintainer
#3 lore raw
Quoted 33 lines · Frank Rowand
Quoted 29 lines · Rob Herring

Remove the manually added __local_fixups__ because dtc can now generate them. This also fixes a new warning in the process:

drivers/of/unittest-data/testcases.dtb: Warning (interrupts_extended_property): Could not get phandle node for /__local_fixups__/testcase-data/interrupts/interrupts-extended0:interrupts-extended(cell 3)

---
 drivers/of/unittest-data/testcases.dts | 56 ++--------------------------------
 1 file changed, 2 insertions(+), 54 deletions(-)
drivers/of/unittest-data/testcases.dts +2 -4
index 12f7c3d649c8..ac616ad18ea6 100644
@@ -1,4 +1,6 @@
 /dts-v1/;
+/plugin/;
+
 / {
      testcase-data {
              changeset {
@@ -23,57 +25,3 @@
  * The format of this data may be subject to change. For the time being consider
  * this a kernel-internal data format.
  */
-/ { __local_fixups__ {
-     testcase-data {
-             phandle-tests {
-                     consumer-a {

< snip >

Quoted 1 line

You should also delete the comment immediately above that describes the removed lines.

Ah yes, I meant to do that.

Rob
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html