Commit 38715dcd authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo

ARM: dts: imx27: Fix memory node duplication

Boards based on imx27 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx27.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 62864d56
...@@ -20,6 +20,7 @@ / { ...@@ -20,6 +20,7 @@ / {
compatible = "armadeus,imx27-apf27", "fsl,imx27"; compatible = "armadeus,imx27-apf27", "fsl,imx27";
memory@a0000000 { memory@a0000000 {
device_type = "memory";
reg = <0xa0000000 0x04000000>; reg = <0xa0000000 0x04000000>;
}; };
}; };
......
...@@ -17,6 +17,7 @@ / { ...@@ -17,6 +17,7 @@ / {
compatible = "eukrea,cpuimx27", "fsl,imx27"; compatible = "eukrea,cpuimx27", "fsl,imx27";
memory@a0000000 { memory@a0000000 {
device_type = "memory";
reg = <0xa0000000 0x04000000>; reg = <0xa0000000 0x04000000>;
}; };
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
compatible = "fsl,imx27-pdk", "fsl,imx27"; compatible = "fsl,imx27-pdk", "fsl,imx27";
memory@a0000000 { memory@a0000000 {
device_type = "memory";
reg = <0xa0000000 0x08000000>; reg = <0xa0000000 0x08000000>;
}; };
......
...@@ -18,6 +18,7 @@ / { ...@@ -18,6 +18,7 @@ / {
compatible = "phytec,imx27-pca100", "fsl,imx27"; compatible = "phytec,imx27-pca100", "fsl,imx27";
memory@a0000000 { memory@a0000000 {
device_type = "memory";
reg = <0xa0000000 0x08000000>; /* 128MB */ reg = <0xa0000000 0x08000000>; /* 128MB */
}; };
}; };
......
...@@ -17,6 +17,7 @@ / { ...@@ -17,6 +17,7 @@ / {
compatible = "phytec,imx27-pcm038", "fsl,imx27"; compatible = "phytec,imx27-pcm038", "fsl,imx27";
memory@a0000000 { memory@a0000000 {
device_type = "memory";
reg = <0xa0000000 0x08000000>; reg = <0xa0000000 0x08000000>;
}; };
......
...@@ -16,10 +16,8 @@ / { ...@@ -16,10 +16,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