summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx7s-colibri.dtsi
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2018-11-06 16:40:47 +0100
committerShawn Guo <shawnguo@kernel.org>2018-12-10 03:02:19 +0100
commit29988e867cb17de7119e971f9acfad2c3fccdb47 (patch)
tree39e5f692d49f9bb5f10a04d3e98b1ee46d9bd3b5 /arch/arm/boot/dts/imx7s-colibri.dtsi
parentARM: dts: imx35: Fix memory node duplication (diff)
downloadlinux-29988e867cb17de7119e971f9acfad2c3fccdb47.tar.xz
linux-29988e867cb17de7119e971f9acfad2c3fccdb47.zip
ARM: dts: imx7: Fix memory node duplication
Boards based on imx7 have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx7s.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>
Diffstat (limited to 'arch/arm/boot/dts/imx7s-colibri.dtsi')
-rw-r--r--arch/arm/boot/dts/imx7s-colibri.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx7s-colibri.dtsi b/arch/arm/boot/dts/imx7s-colibri.dtsi
index fe8344cee864..1fb1ec5d3d70 100644
--- a/arch/arm/boot/dts/imx7s-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7s-colibri.dtsi
@@ -45,6 +45,7 @@
/ {
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x10000000>;
};
};