mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-10 10:39:26 +00:00
ARM: dts: imx53: Fix memory node duplication
[ Upstream commit e8fd17b900
]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
5a1e6f9573
commit
ca02e14bdd
9 changed files with 8 additions and 2 deletions
|
@ -19,6 +19,7 @@ / {
|
|||
compatible = "fsl,imx53-ard", "fsl,imx53";
|
||||
|
||||
memory@70000000 {
|
||||
device_type = "memory";
|
||||
reg = <0x70000000 0x40000000>;
|
||||
};
|
||||
|
||||
|
|
|
@ -22,6 +22,7 @@ chosen {
|
|||
};
|
||||
|
||||
memory@70000000 {
|
||||
device_type = "memory";
|
||||
reg = <0x70000000 0x20000000>,
|
||||
<0xb0000000 0x20000000>;
|
||||
};
|
||||
|
|
|
@ -16,6 +16,7 @@ / {
|
|||
compatible = "aries,imx53-m53", "denx,imx53-m53", "fsl,imx53";
|
||||
|
||||
memory@70000000 {
|
||||
device_type = "memory";
|
||||
reg = <0x70000000 0x20000000>,
|
||||
<0xb0000000 0x20000000>;
|
||||
};
|
||||
|
|
|
@ -11,6 +11,7 @@ chosen {
|
|||
};
|
||||
|
||||
memory@70000000 {
|
||||
device_type = "memory";
|
||||
reg = <0x70000000 0x20000000>,
|
||||
<0xb0000000 0x20000000>;
|
||||
};
|
||||
|
|
|
@ -12,6 +12,7 @@ / {
|
|||
compatible = "fsl,imx53-smd", "fsl,imx53";
|
||||
|
||||
memory@70000000 {
|
||||
device_type = "memory";
|
||||
reg = <0x70000000 0x40000000>;
|
||||
};
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@ / {
|
|||
compatible = "tq,tqma53", "fsl,imx53";
|
||||
|
||||
memory@70000000 {
|
||||
device_type = "memory";
|
||||
reg = <0x70000000 0x40000000>; /* Up to 1GiB */
|
||||
};
|
||||
|
||||
|
|
|
@ -51,6 +51,7 @@ / {
|
|||
|
||||
/* Will be filled by the bootloader */
|
||||
memory@70000000 {
|
||||
device_type = "memory";
|
||||
reg = <0x70000000 0>;
|
||||
};
|
||||
|
||||
|
|
|
@ -58,6 +58,7 @@ chosen {
|
|||
};
|
||||
|
||||
memory@70000000 {
|
||||
device_type = "memory";
|
||||
reg = <0x70000000 0x20000000>;
|
||||
};
|
||||
|
||||
|
|
|
@ -23,10 +23,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;
|
||||
|
|
Loading…
Reference in a new issue