summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/armada-xp-matrix.dts
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-03-04 17:37:02 +0100
committerJason Cooper <jason@lakedaemon.net>2014-03-06 20:59:38 +0100
commitebe021e2688a1f6aaa092f8ea6e72899a2c61a91 (patch)
tree5976c3fb3809b7969a69fc9fee227fdbc2080685 /arch/arm/boot/dts/armada-xp-matrix.dts
parentARM: mvebu: switch the Armada XP GP to use internal registers at 0xf1000000 (diff)
downloadlinux-ebe021e2688a1f6aaa092f8ea6e72899a2c61a91.tar.xz
linux-ebe021e2688a1f6aaa092f8ea6e72899a2c61a91.zip
ARM: mvebu: the Armada XP Matrix board has 4 GB
Since the Armada XP Matrix board has 4 GB of RAM and not 2 GB, we update the Device Tree to take into account the correct amount of memory. As noted in the new comment, the last 256 MB of RAM are in fact not usable, due to the overlap with the MBus Window address range. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts/armada-xp-matrix.dts')
-rw-r--r--arch/arm/boot/dts/armada-xp-matrix.dts7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-xp-matrix.dts b/arch/arm/boot/dts/armada-xp-matrix.dts
index e47c49ecd55c..c2242745b9b8 100644
--- a/arch/arm/boot/dts/armada-xp-matrix.dts
+++ b/arch/arm/boot/dts/armada-xp-matrix.dts
@@ -23,7 +23,12 @@
memory {
device_type = "memory";
- reg = <0 0x00000000 0 0x80000000>; /* 2 GB */
+ /*
+ * This board has 4 GB of RAM, but the last 256 MB of
+ * RAM are not usable due to the overlap with the MBus
+ * Window address range
+ */
+ reg = <0 0x00000000 0 0xf0000000>;
};
soc {