diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-10-02 19:08:24 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-10-02 19:08:24 +0400 |
| commit | 4394a0014597bd53e2d9bbc69d091e3fbde7d00c (patch) | |
| tree | a4f7b9b68aaf5a9a8542bba1f8ea2573838187f2 /arch | |
| parent | 5a6da55f10578b10f30ec72dcca6c37cbeac31ed (diff) | |
| parent | 32c741d07f7fdb1974eb07420fc143d479bfe19f (diff) | |
| download | linux-4394a0014597bd53e2d9bbc69d091e3fbde7d00c.tar.xz | |
Merge tag 'mvebu-dt-3.18-2' of git://git.infradead.org/linux-mvebu into next/dt
Pull "mvebu DT changes for v3.18 (round 2)" from Jason Cooper:
- Armada XP
- Add HW datasheet references to docs
- Armada 370
- Change internal registers to 0xf1000000 for Armada 370 RD board
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'mvebu-dt-3.18-2' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: switch the Armada 370 RD board to internal registers at 0xf1000000
Documentation: arm: add hardware datasheet reference for Marvell Armada XP
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/armada-370-rd.dts | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts index 14c66e4adbc0..f57a8f841498 100644 --- a/arch/arm/boot/dts/armada-370-rd.dts +++ b/arch/arm/boot/dts/armada-370-rd.dts @@ -9,6 +9,15 @@ * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any * 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/; @@ -30,7 +39,7 @@ }; soc { - ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000 + ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000 MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>; pcie-controller { |