From b3ab937f62d8683e0035df084ddbacc6eec414e6 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 20 Nov 2018 13:59:43 -0200 Subject: ARM: dts: imx6ul: Fix memory node duplication Boards based on imx6ul have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx6ul.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 (cherry picked from commit 750d8df6e7b269b828f66631a1d39ea027afc92a) --- arch/arm/boot/dts/imx6ul-isiot.dtsi | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/boot/dts/imx6ul-isiot.dtsi') diff --git a/arch/arm/boot/dts/imx6ul-isiot.dtsi b/arch/arm/boot/dts/imx6ul-isiot.dtsi index 44a4e203d71b..6189af234fc2 100644 --- a/arch/arm/boot/dts/imx6ul-isiot.dtsi +++ b/arch/arm/boot/dts/imx6ul-isiot.dtsi @@ -46,6 +46,7 @@ / { memory { + device_type = "memory"; reg = <0x80000000 0x20000000>; }; -- cgit v1.2.3