commit 32018d1525c6b8bcdb0fd99bf61f4e56c3d25963
author Fabio Estevam <festevam@gmail.com> Mon Nov 26 10:08:56 2018 -0200
committer Shawn Guo <shawnguo@kernel.org> Mon Dec 10 10:02:47 2018 +0800
tree 6c74ddcef6963f62733f0fba5f907da21aca6e24
parent b629e83520fafe6f4c2f3e8c88c78a496fc4987c

ARM: dts: imx28: Fix memory node duplication

Boards based on imx28 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx28.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>

arch/arm/boot/dts/imx28-ts4600.dts

diff --git a/arch/arm/boot/dts/imx28-ts4600.dts b/arch/arm/boot/dts/imx28-ts4600.dts
index dccdd6b..e3fd411 100644
--- a/arch/arm/boot/dts/imx28-ts4600.dts
+++ b/arch/arm/boot/dts/imx28-ts4600.dts
@@ -20,6 +20,7 @@
 	compatible = "technologic,imx28-ts4600", "fsl,imx28";
 
 	memory@40000000 {
+		device_type = "memory";
 		reg = <0x40000000 0x10000000>;   /* 256MB */
 	};