Commit aab5e3ea authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo

ARM: dts: imx50: Fix memory node duplication

imx50-evk has duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx50.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>
parent 88d22f13
...@@ -12,6 +12,7 @@ / { ...@@ -12,6 +12,7 @@ / {
compatible = "fsl,imx50-evk", "fsl,imx50"; compatible = "fsl,imx50-evk", "fsl,imx50";
memory@70000000 { memory@70000000 {
device_type = "memory";
reg = <0x70000000 0x80000000>; reg = <0x70000000 0x80000000>;
}; };
}; };
......
...@@ -22,10 +22,8 @@ / { ...@@ -22,10 +22,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 {
ethernet0 = &fec; ethernet0 = &fec;
......
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