Commit 6bc1e695 authored by Fabio Estevam's avatar Fabio Estevam Committed by Greg Kroah-Hartman

ARM: dts: imx31: Fix memory node duplication

[ Upstream commit 013d37e4 ]

Boards based on imx31 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx31.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>
Reviewed-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Tested-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ca02e14b
...@@ -17,6 +17,7 @@ / { ...@@ -17,6 +17,7 @@ / {
compatible = "buglabs,imx31-bug", "fsl,imx31"; compatible = "buglabs,imx31-bug", "fsl,imx31";
memory@80000000 { memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x8000000>; /* 128M */ reg = <0x80000000 0x8000000>; /* 128M */
}; };
}; };
......
...@@ -18,6 +18,7 @@ chosen { ...@@ -18,6 +18,7 @@ chosen {
}; };
memory@80000000 { memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x8000000>; reg = <0x80000000 0x8000000>;
}; };
......
...@@ -10,10 +10,8 @@ / { ...@@ -10,10 +10,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