ARM: dts: imx7: Fix memory node duplication

Boards based on imx7 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx7s.dtsi file.

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

Reported-by: Rob Herring <robh@kernel.org>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
(cherry picked from commit 29988e867cb17de7119e971f9acfad2c3fccdb47)

Conflicts:
	arch/arm/boot/dts/imx7d-cl-som-imx7.dts
	arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
	arch/arm/boot/dts/imx7d-colibri.dtsi
	arch/arm/boot/dts/imx7d-nitrogen7.dts
	arch/arm/boot/dts/imx7d-pico.dtsi
	arch/arm/boot/dts/imx7d-sdb.dts
	arch/arm/boot/dts/imx7s-colibri.dtsi
	arch/arm/boot/dts/imx7s-warp.dts
	arch/arm/boot/dts/imx7s.dtsi

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>

1 files changed, 1 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index 8b43113a0c26..a80408e3237b 100644
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -53,6 +53,7 @@
 	};
 
 	memory {
+		device_type = "memory";
 		reg = <0x80000000 0x80000000>;
 	};