OSDN Git Service

ARM: dts: imx31: Fix memory node duplication
authorFabio Estevam <festevam@gmail.com>
Tue, 6 Nov 2018 15:40:45 +0000 (13:40 -0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2019 08:19:50 +0000 (09:19 +0100)
commit6bc1e695b4be2f5140f7ec2531f4aa71b40e6474
tree6c91e05870af2b660d5665624c9ed8b94d10ffad
parentca02e14bdd7f1756b5a7ef6ad94dd7111c6440c0
ARM: dts: imx31: Fix memory node duplication

[ Upstream commit 013d37e4707e24c7b9bc3fc55aeda55ce9c2b262 ]

Boards based on imx31 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx31.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>
Reviewed-by: Vladimir Zapolskiy <vz@mleia.com>
Tested-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/boot/dts/imx31-bug.dts
arch/arm/boot/dts/imx31-lite.dts
arch/arm/boot/dts/imx31.dtsi