From 6a9681168b83c62abfa457c709f2f4b126bd6b92 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 5 Nov 2018 19:14:45 -0200 Subject: ARM: dts: imx51: Fix memory node duplication Boards based on imx51 have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx51.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 Signed-off-by: Fabio Estevam Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi') diff --git a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi index 5761a66e8a0d..82d8df097ef1 100644 --- a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi +++ b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi @@ -17,6 +17,7 @@ compatible = "digi,connectcore-ccxmx51-som", "fsl,imx51"; memory@90000000 { + device_type = "memory"; reg = <0x90000000 0x08000000>; }; }; -- cgit v1.2.3-59-g8ed1b