OSDN Git Service

ARM: dts: imx6sl: Fix memory node duplication
authorFabio Estevam <festevam@gmail.com>
Tue, 20 Nov 2018 15:59:45 +0000 (13:59 -0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2019 08:19:53 +0000 (09:19 +0100)
commit2442b4c0f30afddce4a86ad7a505e10a33819846
tree6a85895230f88c6cec192adb7765447c00fba9c9
parentbae011f4c9a4e89f165a801704c295bae5defc69
ARM: dts: imx6sl: Fix memory node duplication

[ Upstream commit 7fa8ab65ee15e386558ac5e971004712da91e2dd ]

Boards based on imx6sl have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx6sl.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/imx6sl-evk.dts
arch/arm/boot/dts/imx6sl-warp.dts
arch/arm/boot/dts/imx6sl.dtsi
arch/arm/boot/dts/imx6sll-evk.dts