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>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index 5920b4e4b74c523674e2545348aec2deaab4caa5..90ce29dbe119e4680b6f7b9b61d177319d8251c1 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index a4202b6c16c214df494e7daee9323452355dc3a8..19341d26f7a34d4b06854223a0821345f91ede18 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index dd0ba018b6285e5ae712c6573a2b4820c36d2e30..0b3acf378a9580943b944fe76b26d1b8c802665e 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 4b54e511baef57014dbf0f04ce71b04d669a763e..bd21d497c13fb323ddc1db989a671bcd284997e3 100644 (file)
--- 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";

diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index 0d4ce54d0c2dd443e3668fc9e148c69d8ea280a5..857f27214a7b0dea39f085a01b4d5ad4ae2e969f 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
index 2fa920987780fcdec06e3887f0fef6721cd48a45..934dc46645dbb8cfb516fc3023f084f5d925ee27 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index a3e3a1290ff54872bfbef07d53fbffe04562d4fe..1700f6fd612749ff09c0857b524ecc932f8ee68c 100644 (file)
--- 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 {

diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 803382497c352f4b6b81518e3a1f7be30d01951d..7ba99ce107bb6b5655e79aafa612a918fe76d217 100644 (file)
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -29,6 +29,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";