Skip to contentSkip to conversation

ARM: mvebu: switch the Armada 370 RD board to internal registers at 0xf1000000

PATCH New Thomas Petazzoni 2 participants 2 messages Sep 17, 2014 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: mvebu: switch the Armada 370 RD board to internal registers at 0xf1000000

Recent bootloader versions from Marvell that have DT support and various other new features remap the internal registers at 0xf1000000. We have already done this change for most of the development boards from Marvell, and this commit does this change for the Marvell Armada 370 RD board.

---
 arch/arm/boot/dts/armada-370-rd.dts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
arch/arm/boot/dts/armada-370-rd.dts +10 -1
index 4169f40..7054611 100644
@@ -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 {
Signature · 1 line
2.0.0
Applied
#1 lore raw

PATCH 1/1 ARM: mvebu: switch the Armada 370 RD board to internal registers at 0xf1000000

Quoted 10 lines · Thomas Petazzoni

Recent bootloader versions from Marvell that have DT support and various other new features remap the internal registers at 0xf1000000. We have already done this change for most of the development boards from Marvell, and this commit does this change for the Marvell Armada 370 RD board.

---
 arch/arm/boot/dts/armada-370-rd.dts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Applied to mvebu/dt

thx,

Jason.