ARM: mvebu: switch the Armada XP GP to use internal registers at 0xf1000000

Marvell has now provided bootloaders that are Device Tree capable for
the Armada XP GP board, and that also remap the internal register base
address to 0xf1000000. In addition, the bootloader now sets the MBus
Window base address to 0xf0000000, which allows to use much more RAM
in the last GB of RAM before the 4 GB limit (the entire space from
0xC0000000 to 0xFFFFFFFF was not usable due to being used for I/O, not
only the space from 0xF0000000 to 0xFFFFFFFF is used for I/O).

Therefore this commit:

 * Updates the memory->reg Device Tree property with the fact that in
   the first bank of RAM, memory up to 0xf0000000 can be used.

 * Updates the soc->ranges Device Tree property with the fact that the
   internal registers are now mapped at 0xf1000000.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Thomas Petazzoni 2014-03-04 17:37:01 +01:00 committed by Jason Cooper
parent 82066bdb5a
commit 91ed32200e

View File

@ -2,7 +2,7 @@
* Device Tree file for Marvell Armada XP development board * Device Tree file for Marvell Armada XP development board
* (DB-MV784MP-GP) * (DB-MV784MP-GP)
* *
* Copyright (C) 2013 Marvell * Copyright (C) 2013-2014 Marvell
* *
* Lior Amsalem <alior@marvell.com> * Lior Amsalem <alior@marvell.com>
* Gregory CLEMENT <gregory.clement@free-electrons.com> * Gregory CLEMENT <gregory.clement@free-electrons.com>
@ -11,6 +11,15 @@
* This file is licensed under the terms of the GNU General Public * This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*
* Note: this Device Tree assumes that the bootloader has remapped the
* internal registers to 0xf1000000 (instead of the default
* 0xd0000000). The 0xf1000000 is the default used by the recent,
* DT-capable, U-Boot bootloaders provided by Marvell. Some earlier
* boards were delivered with an older version of the bootloader that
* left internal registers mapped at 0xd0000000. If you are in this
* situation, you should either update your bootloader (preferred
* solution) or the below Device Tree should be adjusted.
*/ */
/dts-v1/; /dts-v1/;
@ -30,16 +39,17 @@ memory {
* 8 GB of plug-in RAM modules by default.The amount * 8 GB of plug-in RAM modules by default.The amount
* of memory available can be changed by the * of memory available can be changed by the
* bootloader according the size of the module * bootloader according the size of the module
* actually plugged. Only 7GB are usable because * actually plugged. However, memory between
* addresses from 0xC0000000 to 0xffffffff are used by * 0xF0000000 to 0xFFFFFFFF cannot be used, as it is
* the internal registers of the SoC. * the address range used for I/O (internal registers,
* MBus windows).
*/ */
reg = <0x00000000 0x00000000 0x00000000 0xC0000000>, reg = <0x00000000 0x00000000 0x00000000 0xf0000000>,
<0x00000001 0x00000000 0x00000001 0x00000000>; <0x00000001 0x00000000 0x00000001 0x00000000>;
}; };
soc { soc {
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000 ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000 MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000>; MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000>;