ARM: at91: dt: remove unit-address part for memory nodes

Because of the inclusion of skeleton.dtsi, the memory node is
named "memory" we where not modifying the already included one
but creating a new one. It caused bad memory node detection during
early_init_dt_scan_memory() so we modify them.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: devicetree-discuss@lists.ozlabs.org
This commit is contained in:
Ludovic Desroches 2012-04-02 20:44:20 +02:00 committed by Nicolas Ferre
parent 0c2c1f624d
commit dcce6ce802
6 changed files with 6 additions and 6 deletions

View File

@ -35,7 +35,7 @@ cpu@0 {
};
};
memory@20000000 {
memory {
reg = <0x20000000 0x08000000>;
};

View File

@ -36,7 +36,7 @@ cpu@0 {
};
};
memory@70000000 {
memory {
reg = <0x70000000 0x10000000>;
};

View File

@ -17,7 +17,7 @@ chosen {
bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";
};
memory@70000000 {
memory {
reg = <0x70000000 0x4000000>;
};

View File

@ -34,7 +34,7 @@ cpu@0 {
};
};
memory@20000000 {
memory {
reg = <0x20000000 0x10000000>;
};

View File

@ -8,7 +8,7 @@
*/
/ {
memory@20000000 {
memory {
reg = <0x20000000 0x8000000>;
};

View File

@ -16,7 +16,7 @@ chosen {
bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs";
};
memory@20000000 {
memory {
reg = <0x20000000 0x4000000>;
};