Commit 0990926c authored by Fabio Estevam's avatar Fabio Estevam Committed by Greg Kroah-Hartman

ARM: dts: imx6ul: Fix memory node duplication

[ Upstream commit 750d8df6 ]

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: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarFabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e021f0cc
......@@ -12,6 +12,7 @@ chosen {
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
......
......@@ -51,6 +51,7 @@ / {
compatible = "engicam,imx6ul-geam", "fsl,imx6ul";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x08000000>;
};
......
......@@ -46,6 +46,7 @@
/ {
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
......
......@@ -48,6 +48,7 @@ / {
compatible = "grinn,imx6ul-litesom", "fsl,imx6ul";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
};
......
......@@ -49,6 +49,7 @@
/ {
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0>; /* will be filled by U-Boot */
};
......
......@@ -53,6 +53,7 @@ / {
/* Will be filled by the bootloader */
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0>;
};
......
......@@ -71,6 +71,7 @@ chosen {
};
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0>; /* will be filled by U-Boot */
};
......
......@@ -15,10 +15,8 @@ / {
* The decompressor and also some bootloaders rely on a
* pre-existing /chosen node to be available to insert the
* command line and merge other ATAGS info.
* Also for U-Boot there must be a pre-existing /memory node.
*/
chosen {};
memory { device_type = "memory"; };
aliases {
ethernet0 = &fec1;
......
......@@ -7,6 +7,7 @@
/ {
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x10000000>;
};
};
......
......@@ -7,6 +7,7 @@
/ {
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment