Commit 54750b6f authored by Fabio Estevam's avatar Fabio Estevam Committed by Greg Kroah-Hartman

ARM: dts: imx1: Fix memory node duplication

[ Upstream commit 62864d56 ]

Boards based on imx1 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx1.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 6aeb6bd0
...@@ -21,6 +21,7 @@ chosen { ...@@ -21,6 +21,7 @@ chosen {
}; };
memory@8000000 { memory@8000000 {
device_type = "memory";
reg = <0x08000000 0x04000000>; reg = <0x08000000 0x04000000>;
}; };
}; };
......
...@@ -21,6 +21,7 @@ chosen { ...@@ -21,6 +21,7 @@ chosen {
}; };
memory@8000000 { memory@8000000 {
device_type = "memory";
reg = <0x08000000 0x00800000>; reg = <0x08000000 0x00800000>;
}; };
}; };
......
...@@ -15,10 +15,8 @@ / { ...@@ -15,10 +15,8 @@ / {
* The decompressor and also some bootloaders rely on a * The decompressor and also some bootloaders rely on a
* pre-existing /chosen node to be available to insert the * pre-existing /chosen node to be available to insert the
* command line and merge other ATAGS info. * command line and merge other ATAGS info.
* Also for U-Boot there must be a pre-existing /memory node.
*/ */
chosen {}; chosen {};
memory { device_type = "memory"; };
aliases { aliases {
gpio0 = &gpio1; gpio0 = &gpio1;
......
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