summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx7d-cl-som-imx7.dts
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2018-11-06 13:40:47 -0200
committerShawn Guo <shawnguo@kernel.org>2018-12-10 10:02:19 +0800
commit29988e867cb17de7119e971f9acfad2c3fccdb47 (patch)
tree39e5f692d49f9bb5f10a04d3e98b1ee46d9bd3b5 /arch/arm/boot/dts/imx7d-cl-som-imx7.dts
parent8721610a6c2b8c42fc57819d8c3bfbb9166f95a3 (diff)
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/imx7d-cl-som-imx7.dts')
-rw-r--r--arch/arm/boot/dts/imx7d-cl-som-imx7.dts3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts
index 8bf365d28cac..e61567437d73 100644
--- a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts
+++ b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts
@@ -19,6 +19,7 @@
compatible = "compulab,cl-som-imx7", "fsl,imx7d";
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB - minimal configuration */
};
@@ -284,4 +285,4 @@
MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x14 /* OTG PWREN */
>;
};
-}; \ No newline at end of file
+};