summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2018-11-20 13:59:43 -0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2020-02-09 22:45:43 +0100
commitb3ab937f62d8683e0035df084ddbacc6eec414e6 (patch)
tree7f0f0f1d54420d0c35e71ddf2cd70356525851a5 /arch/arm/boot/dts/imx6ul-opos6ul.dtsi
parent0644c7f308e82f6150e089affc18643513444926 (diff)
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 <robh@kernel.org> Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit 750d8df6e7b269b828f66631a1d39ea027afc92a)
Diffstat (limited to 'arch/arm/boot/dts/imx6ul-opos6ul.dtsi')
-rw-r--r--arch/arm/boot/dts/imx6ul-opos6ul.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
index aec5ccce0321..47d11f7b1f96 100644
--- a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
@@ -49,6 +49,7 @@
/ {
memory {
+ device_type = "memory";
reg = <0x80000000 0>; /* will be filled by U-Boot */
};