ARM: dts: imx6qdl: Fix memory node duplication

PATCH In review [email protected] 2 participants 2 messages Dec 5, 2018

Subsystems (3)

Device tree bindings Arm i.MX and Layerscape Dh electronics dhsom som and board support

lore

Share & tools

lore

[email protected]

author

2018-12-05 16:47 UTC #0 lore raw

PATCH 1/1 ARM: dts: imx6qdl: Fix memory node duplication

From: Marco Franchi <[email protected]>

Boards based on imx6qdl have duplicate memory nodes:
- One coming from the board device tree file: memory@
- One coming from the imx6qdl.dtsi file.

Fix the duplication by removing the memory node from the imx6qdl.dtsi file and by adding 'device_type = "memory";' in the board Device Tree.

Converted using the following command:
perl -p0777i -e 's/memory\@10000000 \{\n/memory\@10000000 \{\n\t\tdevice_type = \"memory\";\n/m' `find ./arch/arm/boot/dts -name "imx6*"``

Reported-by Rob Herring <[email protected]>

Signed-off-by Marco Franchi <[email protected]>

---
 arch/arm/boot/dts/imx6dl-apf6dev.dts          | 1 +
 arch/arm/boot/dts/imx6dl-aristainetos2_4.dts  | 1 +
 arch/arm/boot/dts/imx6dl-aristainetos2_7.dts  | 1 +
 arch/arm/boot/dts/imx6dl-aristainetos_4.dts   | 1 +
 arch/arm/boot/dts/imx6dl-aristainetos_7.dts   | 1 +
 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts  | 1 +
 arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts    | 1 +
 arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi   | 1 +
 arch/arm/boot/dts/imx6dl-rex-basic.dts        | 1 +
 arch/arm/boot/dts/imx6dl-riotboard.dts        | 1 +
 arch/arm/boot/dts/imx6dl-ts4900.dts           | 1 +
 arch/arm/boot/dts/imx6dl-ts7970.dts           | 1 +
 arch/arm/boot/dts/imx6dl-wandboard-revb1.dts  | 1 +
 arch/arm/boot/dts/imx6dl-wandboard-revd1.dts  | 1 +
 arch/arm/boot/dts/imx6dl-wandboard.dts        | 1 +
 arch/arm/boot/dts/imx6q-apf6dev.dts           | 1 +
 arch/arm/boot/dts/imx6q-arm2.dts              | 1 +
 arch/arm/boot/dts/imx6q-ba16.dtsi             | 1 +
 arch/arm/boot/dts/imx6q-cm-fx6.dts            | 1 +
 arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts     | 1 +
 arch/arm/boot/dts/imx6q-dhcom-som.dtsi        | 1 +
 arch/arm/boot/dts/imx6q-display5.dtsi         | 1 +
 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts       | 1 +
 arch/arm/boot/dts/imx6q-evi.dts               | 1 +
 arch/arm/boot/dts/imx6q-gk802.dts             | 1 +
 arch/arm/boot/dts/imx6q-gw5400-a.dts          | 1 +
 arch/arm/boot/dts/imx6q-h100.dts              | 1 +
 arch/arm/boot/dts/imx6q-kp-tpc.dts            | 1 +
 arch/arm/boot/dts/imx6q-marsboard.dts         | 1 +
 arch/arm/boot/dts/imx6q-mccmon6.dts           | 1 +
 arch/arm/boot/dts/imx6q-novena.dts            | 1 +
 arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi    | 1 +
 arch/arm/boot/dts/imx6q-pistachio.dts         | 1 +
 arch/arm/boot/dts/imx6q-rex-pro.dts           | 1 +
 arch/arm/boot/dts/imx6q-sbc6x.dts             | 1 +
 arch/arm/boot/dts/imx6q-tbs2910.dts           | 1 +
 arch/arm/boot/dts/imx6q-ts4900.dts            | 1 +
 arch/arm/boot/dts/imx6q-ts7970.dts            | 1 +
 arch/arm/boot/dts/imx6q-wandboard-revb1.dts   | 1 +
 arch/arm/boot/dts/imx6q-wandboard-revd1.dts   | 1 +
 arch/arm/boot/dts/imx6q-wandboard.dts         | 1 +
 arch/arm/boot/dts/imx6q-zii-rdu2.dts          | 1 +
 arch/arm/boot/dts/imx6qdl-apalis.dtsi         | 1 +
 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi        | 1 +
 arch/arm/boot/dts/imx6qdl-emcon.dtsi          | 1 +
 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi         | 1 +
 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi         | 1 +
 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi         | 1 +
 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi         | 1 +
 arch/arm/boot/dts/imx6qdl-gw551x.dtsi         | 1 +
 arch/arm/boot/dts/imx6qdl-gw552x.dtsi         | 1 +
 arch/arm/boot/dts/imx6qdl-gw553x.dtsi         | 1 +
 arch/arm/boot/dts/imx6qdl-gw560x.dtsi         | 1 +
 arch/arm/boot/dts/imx6qdl-gw5903.dtsi         | 1 +
 arch/arm/boot/dts/imx6qdl-gw5904.dtsi         | 1 +
 arch/arm/boot/dts/imx6qdl-hummingboard.dtsi   | 1 +
 arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi  | 1 +
 arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi      | 1 +
 arch/arm/boot/dts/imx6qdl-icore.dtsi          | 1 +
 arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi      | 1 +
 arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi  | 1 +
 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 1 +
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi     | 1 +
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi  | 1 +
 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi      | 1 +
 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi      | 1 +
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi        | 1 +
 arch/arm/boot/dts/imx6qdl-tx6.dtsi            | 1 +
 arch/arm/boot/dts/imx6qdl-udoo.dtsi           | 1 +
 arch/arm/boot/dts/imx6qdl-var-dart.dtsi       | 1 +
 arch/arm/boot/dts/imx6qdl.dtsi                | 1 -
 arch/arm/boot/dts/imx6qp-wandboard-revd1.dts  | 1 +
 arch/arm/boot/dts/imx6qp-zii-rdu2.dts         | 1 +
 73 files changed, 72 insertions(+), 1 deletion(-)

arch/arm/boot/dts/imx6dl-apf6dev.dts +1 -0

index 4a7f86de6c39..6632e99fbb68 100644
@@ -55,6 +55,7 @@
 	compatible = "armadeus,imx6dl-apf6dev", "armadeus,imx6dl-apf6", "fsl,imx6dl";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};
 };

arch/arm/boot/dts/imx6dl-aristainetos2_4.dts +1 -0

index 29940ba215a8..b16603f27dce 100644
@@ -49,6 +49,7 @@
 	compatible = "fsl,imx6dl";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6dl-aristainetos2_7.dts +1 -0

index 240f3661469f..abb2a1b9ce08 100644
@@ -49,6 +49,7 @@
 	compatible = "fsl,imx6dl";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6dl-aristainetos_4.dts +1 -0

index ad7733662fe5..b87a85cd44ac 100644
@@ -28,6 +28,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6dl-aristainetos_7.dts +1 -0

index 64ed84e3c512..e71ad9062fd1 100644
@@ -17,6 +17,7 @@
 	compatible = "fsl,imx6dl";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +1 -0

index d08e0402793b..d5f7a1703aae 100644
@@ -55,6 +55,7 @@
 
 	/* Will be filled by the bootloader */
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0>;
 	};

arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts +1 -0

index 89384cb618f6..588286adee67 100644
@@ -23,6 +23,7 @@
 
 	/* Will be filled by the bootloader */
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0>;
 	};
 };

arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi +1 -0

index 7d9888937f12..d7e72993eaf8 100644
@@ -17,6 +17,7 @@
 	compatible = "phytec,imx6dl-pfla02", "fsl,imx6dl";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};
 };

arch/arm/boot/dts/imx6dl-rex-basic.dts +1 -0

index 3fb7f4ee2496..853e58defa9c 100644
@@ -17,6 +17,7 @@
 	compatible = "rex,imx6dl-rex-basic", "fsl,imx6dl";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};
 };

arch/arm/boot/dts/imx6dl-riotboard.dts +1 -0

index 8e51491e68cf..65c184bb8fb0 100644
@@ -16,6 +16,7 @@
 	compatible = "riot,imx6s-riotboard", "fsl,imx6dl";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6dl-ts4900.dts +1 -0

index cc01a7a22e30..3d60cc725d9e 100644
@@ -49,6 +49,7 @@
 
 	/* Will be filled by the bootloader */
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0>;
 	};
 };

arch/arm/boot/dts/imx6dl-ts7970.dts +1 -0

index 82435d5bf33f..5da6feba2e66 100644
@@ -50,6 +50,7 @@
 
 	/* Will be filled by the bootloader */
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0>;
 	};
 };

arch/arm/boot/dts/imx6dl-wandboard-revb1.dts +1 -0

index 738db4fc7702..c2946fbaa0dd 100644
@@ -13,6 +13,7 @@
 	compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 };

arch/arm/boot/dts/imx6dl-wandboard-revd1.dts +1 -0

index 51de6b4bd7d8..6d1d863c2e3a 100644
@@ -13,6 +13,7 @@
 	compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 };

arch/arm/boot/dts/imx6dl-wandboard.dts +1 -0

index b43454deaa1a..4a08d5a99452 100644
@@ -13,6 +13,7 @@
 	compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 };

arch/arm/boot/dts/imx6q-apf6dev.dts +1 -0

index 5e72f81cdf8b..07a36bb8075b 100644
@@ -55,6 +55,7 @@
 	compatible = "armadeus,imx6q-apf6dev", "armadeus,imx6q-apf6", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 };

arch/arm/boot/dts/imx6q-arm2.dts +1 -0

index 953a5b5a8ea4..baadcb7fe011 100644
@@ -19,6 +19,7 @@
 	compatible = "fsl,imx6q-arm2", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};

arch/arm/boot/dts/imx6q-ba16.dtsi +1 -0

index e903c488287b..adc9455e42c7 100644
@@ -47,6 +47,7 @@
 
 / {
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6q-cm-fx6.dts +1 -0

index 18ae4f3be6e3..cab9e92531c7 100644
@@ -51,6 +51,7 @@
 	compatible = "compulab,cm-fx6", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};

arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts +1 -0

index ad12d76bbb89..e13acbbcdff4 100644
@@ -23,6 +23,7 @@
 
 	/* Will be filled by the bootloader */
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0>;
 	};
 };

arch/arm/boot/dts/imx6q-dhcom-som.dtsi +1 -0

index bbba0671f0f4..387801dde02e 100644
@@ -19,6 +19,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6q-display5.dtsi +1 -0

index 85232c7c36a0..83524bb99eb3 100644
@@ -48,6 +48,7 @@
 	compatible = "lwn,display5", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts +1 -0

index b3c6a4a7897d..ee8c38eee03b 100644
@@ -30,6 +30,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};

arch/arm/boot/dts/imx6q-evi.dts +1 -0

index fcd257bc5ac3..c63f371ede8b 100644
@@ -51,6 +51,7 @@
 	compatible = "uniwest,imx6q-evi", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6q-gk802.dts +1 -0

index 84d3540b3a97..ccc2487d47ca 100644
@@ -20,6 +20,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6q-gw5400-a.dts +1 -0

index a8f70b4266ef..4038170369fc 100644
@@ -61,6 +61,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6q-h100.dts +1 -0

index 714e09e04dcb..b8feadbff967 100644
@@ -51,6 +51,7 @@
 
 	/* Will be filled by the bootloader */
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0>;
 	};

arch/arm/boot/dts/imx6q-kp-tpc.dts +1 -0

index 302d8d06e4cc..50fbf46d17c2 100644
@@ -13,6 +13,7 @@
 	compatible = "kiebackpeter,imx6q-tpc", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 };

arch/arm/boot/dts/imx6q-marsboard.dts +1 -0

index dd763f205819..d8ccb533b6b7 100644
@@ -48,6 +48,7 @@
 	compatible = "embest,imx6q-marsboard", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6q-mccmon6.dts +1 -0

index b7e9f38cec72..74d9824e920b 100644
@@ -20,6 +20,7 @@
 	compatible = "lwn,mccmon6", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};

arch/arm/boot/dts/imx6q-novena.dts +1 -0

index fcd824dc485b..61347a545d6c 100644
@@ -57,6 +57,7 @@
 
 	/* Will be filled by the bootloader */
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0>;
 	};

arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi +1 -0

index fad858c30fe9..097f2c56c20b 100644
@@ -17,6 +17,7 @@
 	compatible = "phytec,imx6q-pfla02", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};
 };

arch/arm/boot/dts/imx6q-pistachio.dts +1 -0

index a31e83cd07a3..5edf858c8b86 100644
@@ -57,6 +57,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};

arch/arm/boot/dts/imx6q-rex-pro.dts +1 -0

index d6cae73b1927..aa3004eab06c 100644
@@ -17,6 +17,7 @@
 	compatible = "rex,imx6q-rex-pro", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};
 };

arch/arm/boot/dts/imx6q-sbc6x.dts +1 -0

index b7aa2f0b9f53..3129f727750f 100644
@@ -13,6 +13,7 @@
 	compatible = "microsys,sbc6x", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};
 };

arch/arm/boot/dts/imx6q-tbs2910.dts +1 -0

index 505cba776a2d..279b15e9ae2e 100644
@@ -60,6 +60,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};

arch/arm/boot/dts/imx6q-ts4900.dts +1 -0

index e655107edc56..dce1e8671ebe 100644
@@ -49,6 +49,7 @@
 
 	/* Will be filled by the bootloader */
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0>;
 	};
 };

arch/arm/boot/dts/imx6q-ts7970.dts +1 -0

index c615ac4feede..570bd3c309a6 100644
@@ -50,6 +50,7 @@
 
 	/* Will be filled by the bootloader */
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0>;
 	};
 };

arch/arm/boot/dts/imx6q-wandboard-revb1.dts +1 -0

index be85b980bdfe..f6ccbecff92c 100644
@@ -13,6 +13,7 @@
 	compatible = "wand,imx6q-wandboard", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};
 };

arch/arm/boot/dts/imx6q-wandboard-revd1.dts +1 -0

index fcfba28764d4..55331021d80c 100644
@@ -13,6 +13,7 @@
 	compatible = "wand,imx6q-wandboard", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};
 };

arch/arm/boot/dts/imx6q-wandboard.dts +1 -0

index fa36fe183fc0..0be548beef86 100644
@@ -13,6 +13,7 @@
 	compatible = "wand,imx6q-wandboard", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};
 };

arch/arm/boot/dts/imx6q-zii-rdu2.dts +1 -0

index 7da6dde9c857..0f0743db2779 100644
@@ -50,6 +50,7 @@
 
 	/* Will be filled by the bootloader */
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0>;
 	};
 };

arch/arm/boot/dts/imx6qdl-apalis.dtsi +1 -0

index 3dc99dd8dde1..8380f1b26826 100644
@@ -49,6 +49,7 @@
 
 	/* Will be filled by the bootloader */
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0>;
 	};

arch/arm/boot/dts/imx6qdl-cubox-i.dtsi +1 -0

index 9332a31e6c8b..e3be453d8a4a 100644
@@ -44,6 +44,7 @@
 / {
 	/* Will be filled by the bootloader */
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0>;
 	};

arch/arm/boot/dts/imx6qdl-emcon.dtsi +1 -0

index bfd5f373921e..397e205551c4 100644
@@ -24,6 +24,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6qdl-gw51xx.dtsi +1 -0

index 17a7b9c083d0..d3609966b846 100644
@@ -45,6 +45,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};

arch/arm/boot/dts/imx6qdl-gw52xx.dtsi +1 -0

index b8044681006c..2ff377d0df7e 100644
@@ -60,6 +60,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};

arch/arm/boot/dts/imx6qdl-gw53xx.dtsi +1 -0

index 629908fbaa32..68ab54351109 100644
@@ -60,6 +60,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6qdl-gw54xx.dtsi +1 -0

index a1a6fb5541e1..81b2fcf6eedf 100644
@@ -60,6 +60,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6qdl-gw551x.dtsi +1 -0

index 4e21b3849394..8e46a80f57a4 100644
@@ -75,6 +75,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};

arch/arm/boot/dts/imx6qdl-gw552x.dtsi +1 -0

index 81dae5b5bc87..dacc2a14d0e7 100644
@@ -52,6 +52,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};

arch/arm/boot/dts/imx6qdl-gw553x.dtsi +1 -0

index c5d95e8d2e09..a1066897be18 100644
@@ -81,6 +81,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};

arch/arm/boot/dts/imx6qdl-gw560x.dtsi +1 -0

index b5986efe1090..e8e36dfd0a6b 100644
@@ -114,6 +114,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6qdl-gw5903.dtsi +1 -0

index 368132274a91..9cb9a7439121 100644
@@ -84,6 +84,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6qdl-gw5904.dtsi +1 -0

index 3c52bdb453f3..6d21cc6a9d4b 100644
@@ -94,6 +94,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6qdl-hummingboard.dtsi +1 -0

index 0e64016e765f..2ffb21dd89f2 100644
@@ -43,6 +43,7 @@
 / {
 	/* Will be filled by the bootloader */
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0>;
 	};

arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi +1 -0

index c413f9c3540f..e4231331f04e 100644
@@ -43,6 +43,7 @@
 / {
 	/* Will be filled by the bootloader */
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0>;
 	};

arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi +1 -0

index ba93026ecee8..1d1b4bd0670f 100644
@@ -10,6 +10,7 @@
 
 / {
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};

arch/arm/boot/dts/imx6qdl-icore.dtsi +1 -0

index aaed37c73c29..7814f1ef0804 100644
@@ -10,6 +10,7 @@
 
 / {
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};

arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi +1 -0

index 29baf25ae5d0..7a85116ef1d2 100644
@@ -11,6 +11,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};

arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi +1 -0

index 39200e5dc896..c3415aa348a2 100644
@@ -11,6 +11,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0xF0000000>;
 	};

arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi +1 -0

index 572abd7499b1..ed53f07c6b7b 100644
@@ -11,6 +11,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi +1 -0

index 98384a6c5d12..8b0e432099b5 100644
@@ -13,6 +13,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi +1 -0

index ed1aafd56973..1b50b01e9bac 100644
@@ -16,6 +16,7 @@
 	compatible = "phytec,imx6q-pfla02", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};

arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +1 -0

index 38f94a1dddac..4402c0af62b1 100644
@@ -12,6 +12,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};

arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +1 -0

index 654cf2c9b073..8468216dae9b 100644
@@ -50,6 +50,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6qdl-sabresd.dtsi +1 -0

index 6e46a195b399..9ac9e1bdc812 100644
@@ -13,6 +13,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6qdl-tx6.dtsi +1 -0

index a98fb2564c63..c68cb90fd801 100644
@@ -62,6 +62,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0>; /* will be filled by U-Boot */
 	};

arch/arm/boot/dts/imx6qdl-udoo.dtsi +1 -0

index 40d1b0d9faff..776bfc77f89d 100644
@@ -32,6 +32,7 @@
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6qdl-var-dart.dtsi +1 -0

index 38080c1dfaec..8752a4961c47 100644
@@ -11,6 +11,7 @@
 
 / {
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};

arch/arm/boot/dts/imx6qdl.dtsi +0 -1

index 6d827b69ead0..84afc555606f 100644
@@ -16,7 +16,6 @@
 	 * Also for U-Boot there must be a pre-existing /memory node.
 	 */
 	chosen {};
-	memory { device_type = "memory"; };
 
 	aliases {
 		ethernet0 = &fec;

arch/arm/boot/dts/imx6qp-wandboard-revd1.dts +1 -0

index bcca5ac5fa51..08d8b78a2096 100644
@@ -13,6 +13,7 @@
 	compatible = "wand,imx6qp-wandboard", "fsl,imx6qp";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};
 };

arch/arm/boot/dts/imx6qp-zii-rdu2.dts +1 -0

index 8c293e9f36a7..98bf7a6b2850 100644
@@ -50,6 +50,7 @@
 
 	/* Will be filled by the bootloader */
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0>;
 	};
 };

Signature · 7 lines

2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Fabio Estevam

reviewer

2018-12-05 17:05 UTC #1 lore raw

Hi Marco,

Thanks for your help on this!

It looks good to me. Just a minor nit:

arch/arm/boot/dts/imx6qdl.dtsi line 16

Quoted 6 lines · On Wed, Dec 5, 2018 at 2:47 PM <[email protected]> wrote:

arch/arm/boot/dts/imx6qdl.dtsi +0 -0

index 6d827b69ead0..84afc555606f 100644
@@ -16,7 +16,6 @@
         * Also for U-Boot there must be a pre-existing /memory node.

Please remove this comment line.

I also fixed the two occurrences that your script captured where we have incorrect or missing memory nodes.

I have just sent them to you. Please include them on your v2.

Thanks

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel