Commit 8721610a authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo

ARM: dts: imx35: Fix memory node duplication

Boards based on imx35 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx35.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 013d37e4
......@@ -18,6 +18,7 @@ / {
compatible = "eukrea,cpuimx35", "fsl,imx35";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x8000000>; /* 128M */
};
};
......
......@@ -11,6 +11,7 @@ / {
compatible = "fsl,imx35-pdk", "fsl,imx35";
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x8000000>,
<0x90000000 0x8000000>;
};
......
......@@ -13,10 +13,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 = &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