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: Rob Herring <robh@kernel.org> Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
This commit is contained in:
parent
013d37e470
commit
8721610a6c
|
@ -18,6 +18,7 @@
|
||||||
compatible = "eukrea,cpuimx35", "fsl,imx35";
|
compatible = "eukrea,cpuimx35", "fsl,imx35";
|
||||||
|
|
||||||
memory@80000000 {
|
memory@80000000 {
|
||||||
|
device_type = "memory";
|
||||||
reg = <0x80000000 0x8000000>; /* 128M */
|
reg = <0x80000000 0x8000000>; /* 128M */
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
compatible = "fsl,imx35-pdk", "fsl,imx35";
|
compatible = "fsl,imx35-pdk", "fsl,imx35";
|
||||||
|
|
||||||
memory@80000000 {
|
memory@80000000 {
|
||||||
|
device_type = "memory";
|
||||||
reg = <0x80000000 0x8000000>,
|
reg = <0x80000000 0x8000000>,
|
||||||
<0x90000000 0x8000000>;
|
<0x90000000 0x8000000>;
|
||||||
};
|
};
|
||||||
|
|
|
@ -13,10 +13,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;
|
||||||
|
|
Loading…
Reference in New Issue