You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
124 lines
3.7 KiB
Diff
124 lines
3.7 KiB
Diff
From 1028055490cf9d6e146f57d920e8cfff4eda37e2 Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Fri, 14 Jun 2013 10:34:45 -0300
|
|
Subject: [PATCH 057/203] ARM: mvebu: Add BootROM to Armada 370/XP device tree
|
|
|
|
In order to access the SoC BootROM, we need to declare a mapping
|
|
(through a ranges property). The mbus driver will use this property
|
|
to allocate a suitable address decoding window.
|
|
|
|
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Tested-by: Andrew Lunn <andrew@lunn.ch>
|
|
Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
|
---
|
|
arch/arm/boot/dts/armada-370-db.dts | 3 ++-
|
|
arch/arm/boot/dts/armada-370-mirabox.dts | 3 ++-
|
|
arch/arm/boot/dts/armada-370-rd.dts | 3 ++-
|
|
arch/arm/boot/dts/armada-370.dtsi | 5 +++++
|
|
arch/arm/boot/dts/armada-xp-db.dts | 3 ++-
|
|
arch/arm/boot/dts/armada-xp-gp.dts | 3 ++-
|
|
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 3 ++-
|
|
arch/arm/boot/dts/armada-xp.dtsi | 5 +++++
|
|
8 files changed, 22 insertions(+), 6 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/armada-370-db.dts
|
|
+++ b/arch/arm/boot/dts/armada-370-db.dts
|
|
@@ -30,7 +30,8 @@
|
|
};
|
|
|
|
soc {
|
|
- ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>;
|
|
+ ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000
|
|
+ MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
|
|
|
|
internal-regs {
|
|
serial@12000 {
|
|
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
|
|
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
|
|
@@ -25,7 +25,8 @@
|
|
};
|
|
|
|
soc {
|
|
- ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>;
|
|
+ ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000
|
|
+ MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
|
|
|
|
internal-regs {
|
|
serial@12000 {
|
|
--- a/arch/arm/boot/dts/armada-370-rd.dts
|
|
+++ b/arch/arm/boot/dts/armada-370-rd.dts
|
|
@@ -28,7 +28,8 @@
|
|
};
|
|
|
|
soc {
|
|
- ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>;
|
|
+ ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000
|
|
+ MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
|
|
|
|
internal-regs {
|
|
serial@12000 {
|
|
--- a/arch/arm/boot/dts/armada-370.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-370.dtsi
|
|
@@ -31,6 +31,11 @@
|
|
soc {
|
|
compatible = "marvell,armada370-mbus", "simple-bus";
|
|
|
|
+ bootrom {
|
|
+ compatible = "marvell,bootrom";
|
|
+ reg = <MBUS_ID(0x01, 0xe0) 0 0x100000>;
|
|
+ };
|
|
+
|
|
internal-regs {
|
|
system-controller@18200 {
|
|
compatible = "marvell,armada-370-xp-system-controller";
|
|
--- a/arch/arm/boot/dts/armada-xp-db.dts
|
|
+++ b/arch/arm/boot/dts/armada-xp-db.dts
|
|
@@ -30,7 +30,8 @@
|
|
};
|
|
|
|
soc {
|
|
- ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>;
|
|
+ ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
|
|
+ MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
|
|
|
|
internal-regs {
|
|
serial@12000 {
|
|
--- a/arch/arm/boot/dts/armada-xp-gp.dts
|
|
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
|
|
@@ -39,7 +39,8 @@
|
|
};
|
|
|
|
soc {
|
|
- ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>;
|
|
+ ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
|
|
+ MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
|
|
|
|
internal-regs {
|
|
serial@12000 {
|
|
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
|
|
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
|
|
@@ -27,7 +27,8 @@
|
|
};
|
|
|
|
soc {
|
|
- ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>;
|
|
+ ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
|
|
+ MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
|
|
|
|
internal-regs {
|
|
serial@12000 {
|
|
--- a/arch/arm/boot/dts/armada-xp.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp.dtsi
|
|
@@ -25,6 +25,11 @@
|
|
soc {
|
|
compatible = "marvell,armadaxp-mbus", "simple-bus";
|
|
|
|
+ bootrom {
|
|
+ compatible = "marvell,bootrom";
|
|
+ reg = <MBUS_ID(0x01, 0x1d) 0 0x100000>;
|
|
+ };
|
|
+
|
|
internal-regs {
|
|
L2: l2-cache {
|
|
compatible = "marvell,aurora-system-cache";
|