ARM: dts: imx6qdl: Fix memory node duplication

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 <robh@kernel.org>
Signed-off-by: Marco Franchi <marco.franchi@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

arch/arm/boot/dts/imx6dl-apf6dev.dts

@@ -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

@@ -49,6 +49,7 @@ / {
 	compatible = "fsl,imx6dl";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6dl-aristainetos2_7.dts

@@ -49,6 +49,7 @@ / {
 	compatible = "fsl,imx6dl";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6dl-aristainetos_4.dts

@@ -28,6 +28,7 @@ backlight {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6dl-aristainetos_7.dts

@@ -17,6 +17,7 @@ / {
 	compatible = "fsl,imx6dl";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

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

arch/arm/boot/dts/imx6q-cm-fx6.dts

@@ -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

@@ -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

@@ -19,6 +19,7 @@ aliases {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6q-display5.dtsi

@@ -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

@@ -30,6 +30,7 @@ aliases {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};
 

arch/arm/boot/dts/imx6q-evi.dts

@@ -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

@@ -20,6 +20,7 @@ chosen {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6q-gw5400-a.dts

@@ -61,6 +61,7 @@ led2: user3 {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6q-h100.dts

@@ -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

@@ -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

@@ -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

@@ -20,6 +20,7 @@ / {
 	compatible = "lwn,mccmon6", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};
 

arch/arm/boot/dts/imx6q-novena.dts

@@ -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

@@ -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

@@ -57,6 +57,7 @@ chosen {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};
 

arch/arm/boot/dts/imx6q-rex-pro.dts

@@ -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

@@ -13,6 +13,7 @@ / {
 	compatible = "microsys,sbc6x", "fsl,imx6q";
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};
 };

arch/arm/boot/dts/imx6q-tbs2910.dts

@@ -60,6 +60,7 @@ chosen {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};
 

arch/arm/boot/dts/imx6q-ts4900.dts

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -24,6 +24,7 @@ chosen {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-gw51xx.dtsi

@@ -45,6 +45,7 @@ led1: user2 {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-gw52xx.dtsi

@@ -60,6 +60,7 @@ led2: user3 {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-gw53xx.dtsi

@@ -60,6 +60,7 @@ led2: user3 {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-gw54xx.dtsi

@@ -60,6 +60,7 @@ led2: user3 {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-gw551x.dtsi

@@ -75,6 +75,7 @@ led0: user1 {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-gw552x.dtsi

@@ -52,6 +52,7 @@ led2: user3 {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-gw553x.dtsi

@@ -81,6 +81,7 @@ led1: user2 {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-gw560x.dtsi

@@ -114,6 +114,7 @@ led2: user3 {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-gw5903.dtsi

@@ -84,6 +84,7 @@ led0: user1 {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-gw5904.dtsi

@@ -94,6 +94,7 @@ led2: user3 {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-hummingboard.dtsi

@@ -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

@@ -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

@@ -10,6 +10,7 @@
 
 / {
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-icore.dtsi

@@ -10,6 +10,7 @@
 
 / {
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi

@@ -11,6 +11,7 @@ chosen {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x20000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi

@@ -11,6 +11,7 @@ chosen {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0xF0000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi

@@ -11,6 +11,7 @@ chosen {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi

@@ -13,6 +13,7 @@ chosen {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi

@@ -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

@@ -12,6 +12,7 @@ chosen {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x80000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-sabrelite.dtsi

@@ -50,6 +50,7 @@ chosen {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-sabresd.dtsi

@@ -13,6 +13,7 @@ chosen {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-tx6.dtsi

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

arch/arm/boot/dts/imx6qdl-udoo.dtsi

@@ -32,6 +32,7 @@ gpio-poweroff {
 	};
 
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6qdl-var-dart.dtsi

@@ -11,6 +11,7 @@
 
 / {
 	memory@10000000 {
+		device_type = "memory";
 		reg = <0x10000000 0x40000000>;
 	};
 

arch/arm/boot/dts/imx6qdl.dtsi

@@ -13,10 +13,8 @@ / {
 	 * The decompressor and also some bootloaders rely on a
 	 * pre-existing /chosen node to be available to insert the
 	 * command line and merge other ATAGS info.
-	 * 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

@@ -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

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