Skip to content

Commit

Permalink
ARM: at91: dt: remove unit-address part for memory nodes
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Ludovic Desroches authored and Nicolas Ferre committed Apr 4, 2012
1 parent 0c2c1f6 commit dcce6ce
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/at91sam9g20.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
};
};

memory@20000000 {
memory {
reg = <0x20000000 0x08000000>;
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/at91sam9g45.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
};
};

memory@70000000 {
memory {
reg = <0x70000000 0x10000000>;
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/at91sam9m10g45ek.dts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";
};

memory@70000000 {
memory {
reg = <0x70000000 0x4000000>;
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/at91sam9x5.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
};
};

memory@20000000 {
memory {
reg = <0x20000000 0x10000000>;
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/at91sam9x5cm.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

/ {
memory@20000000 {
memory {
reg = <0x20000000 0x8000000>;
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/usb_a9g20.dts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs";
};

memory@20000000 {
memory {
reg = <0x20000000 0x4000000>;
};

Expand Down

0 comments on commit dcce6ce

Please sign in to comment.