summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/usb_a9g20.dts
diff options
context:
space:
mode:
authorLudovic Desroches <ludovic.desroches@atmel.com>2012-04-02 20:44:20 +0200
committerNicolas Ferre <nicolas.ferre@atmel.com>2012-04-04 18:35:52 +0200
commitdcce6ce802c271cd7c21f4730f301150577b2826 (patch)
treeefc68f901d46081763b79d7c04ddd58b17bb19ab /arch/arm/boot/dts/usb_a9g20.dts
parent0c2c1f624d4f99825851f0253f1308dd591df6ef (diff)
downloadlinux-dcce6ce802c271cd7c21f4730f301150577b2826.tar.bz2
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
Diffstat (limited to 'arch/arm/boot/dts/usb_a9g20.dts')
-rw-r--r--arch/arm/boot/dts/usb_a9g20.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/usb_a9g20.dts b/arch/arm/boot/dts/usb_a9g20.dts
index 3b3c4e0fa79f..7c2399c532e5 100644
--- a/arch/arm/boot/dts/usb_a9g20.dts
+++ b/arch/arm/boot/dts/usb_a9g20.dts
@@ -16,7 +16,7 @@
bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs";
};
- memory@20000000 {
+ memory {
reg = <0x20000000 0x4000000>;
};