OSDN Git Service

ARM: dts: imx25: Fix memory node duplication
authorFabio Estevam <festevam@gmail.com>
Mon, 26 Nov 2018 12:40:54 +0000 (10:40 -0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2019 08:19:56 +0000 (09:19 +0100)
commitbf39f5b323ebb63dcd0497dc1df9923e9315f2f6
treeecba4c1ce95092ca81ff62ce1afa0a0d30dcfcd8
parentd2eb50e57a5cef9f8ad0bf749291be90ec77428f
ARM: dts: imx25: Fix memory node duplication

[ Upstream commit 59d8bb363f563e4a147a291037bf979cb8ff9a59 ]

Boards based on imx25 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx25.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/imx25-eukrea-cpuimx25.dtsi
arch/arm/boot/dts/imx25-karo-tx25.dts
arch/arm/boot/dts/imx25-pdk.dts
arch/arm/boot/dts/imx25.dtsi