summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx53-ard.dts
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2018-11-05 19:14:46 -0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-05 09:19:50 +0100
commitca02e14bdd7f1756b5a7ef6ad94dd7111c6440c0 (patch)
tree1d5daefa0c159daf0b252e5c1ac2600952ef7e76 /arch/arm/boot/dts/imx53-ard.dts
parent5a1e6f95733c6438a694078b158f7a19ff687dd0 (diff)
downloadlinux-stable-ca02e14bdd7f1756b5a7ef6ad94dd7111c6440c0.tar.gz
linux-stable-ca02e14bdd7f1756b5a7ef6ad94dd7111c6440c0.tar.bz2
linux-stable-ca02e14bdd7f1756b5a7ef6ad94dd7111c6440c0.zip
ARM: dts: imx53: Fix memory node duplication
[ Upstream commit e8fd17b900a4a1e3a8bef7b44727cbad35db05a7 ] Boards based on imx53 have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx53.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>
Diffstat (limited to 'arch/arm/boot/dts/imx53-ard.dts')
-rw-r--r--arch/arm/boot/dts/imx53-ard.dts1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx53-ard.dts b/arch/arm/boot/dts/imx53-ard.dts
index 117bd002dd1d..7d5a48250f86 100644
--- a/arch/arm/boot/dts/imx53-ard.dts
+++ b/arch/arm/boot/dts/imx53-ard.dts
@@ -19,6 +19,7 @@
compatible = "fsl,imx53-ard", "fsl,imx53";
memory@70000000 {
+ device_type = "memory";
reg = <0x70000000 0x40000000>;
};