Boards based on imx53 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx53.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: Rob Herring <robh@kernel.org>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
compatible = "fsl,imx53-ard", "fsl,imx53";
memory@70000000 {
compatible = "fsl,imx53-ard", "fsl,imx53";
memory@70000000 {
+ device_type = "memory";
reg = <0x70000000 0x40000000>;
};
reg = <0x70000000 0x40000000>;
};
+ device_type = "memory";
reg = <0x70000000 0x20000000>,
<0xb0000000 0x20000000>;
};
reg = <0x70000000 0x20000000>,
<0xb0000000 0x20000000>;
};
compatible = "aries,imx53-m53", "denx,imx53-m53", "fsl,imx53";
memory@70000000 {
compatible = "aries,imx53-m53", "denx,imx53-m53", "fsl,imx53";
memory@70000000 {
+ device_type = "memory";
reg = <0x70000000 0x20000000>,
<0xb0000000 0x20000000>;
};
reg = <0x70000000 0x20000000>,
<0xb0000000 0x20000000>;
};
+ device_type = "memory";
reg = <0x70000000 0x20000000>,
<0xb0000000 0x20000000>;
};
reg = <0x70000000 0x20000000>,
<0xb0000000 0x20000000>;
};
compatible = "fsl,imx53-smd", "fsl,imx53";
memory@70000000 {
compatible = "fsl,imx53-smd", "fsl,imx53";
memory@70000000 {
+ device_type = "memory";
reg = <0x70000000 0x40000000>;
};
reg = <0x70000000 0x40000000>;
};
compatible = "tq,tqma53", "fsl,imx53";
memory@70000000 {
compatible = "tq,tqma53", "fsl,imx53";
memory@70000000 {
+ device_type = "memory";
reg = <0x70000000 0x40000000>; /* Up to 1GiB */
};
reg = <0x70000000 0x40000000>; /* Up to 1GiB */
};
/* Will be filled by the bootloader */
memory@70000000 {
/* Will be filled by the bootloader */
memory@70000000 {
+ device_type = "memory";
+ device_type = "memory";
reg = <0x70000000 0x20000000>;
};
reg = <0x70000000 0x20000000>;
};
* 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.
* 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.
- memory { device_type = "memory"; };
aliases {
ethernet0 = &fec;
aliases {
ethernet0 = &fec;