OSDN Git Service

ARM: dts: imx1: Fix memory node duplication
authorFabio Estevam <festevam@gmail.com>
Mon, 26 Nov 2018 12:40:52 +0000 (10:40 -0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2019 08:19:55 +0000 (09:19 +0100)
commit54750b6f66715bc1d205d57d93a503b3eb04a284
treeeae7203bfea942d78340ddfd64d4cae7a9903404
parent6aeb6bd0eda6c0b693f4070e6501903093f7a777
ARM: dts: imx1: Fix memory node duplication

[ Upstream commit 62864d5665c4fc636d3021f829b3ac00fa058e30 ]

Boards based on imx1 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx1.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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/boot/dts/imx1-ads.dts
arch/arm/boot/dts/imx1-apf9328.dts
arch/arm/boot/dts/imx1.dtsi