diff options
| -rw-r--r-- | arch/arm/boot/dts/armada-370-db.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-370-mirabox.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-370-rd.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-370.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-db.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-gp.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 5 |
8 files changed, 22 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts index 5920b4e4b74c..90ce29dbe119 100644 --- a/arch/arm/boot/dts/armada-370-db.dts +++ b/arch/arm/boot/dts/armada-370-db.dts | |||
| @@ -30,7 +30,8 @@ | |||
| 30 | }; | 30 | }; |
| 31 | 31 | ||
| 32 | soc { | 32 | soc { |
| 33 | ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>; | 33 | ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000 |
| 34 | MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>; | ||
| 34 | 35 | ||
| 35 | internal-regs { | 36 | internal-regs { |
| 36 | serial@12000 { | 37 | serial@12000 { |
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts index a4202b6c16c2..19341d26f7a3 100644 --- a/arch/arm/boot/dts/armada-370-mirabox.dts +++ b/arch/arm/boot/dts/armada-370-mirabox.dts | |||
| @@ -25,7 +25,8 @@ | |||
| 25 | }; | 25 | }; |
| 26 | 26 | ||
| 27 | soc { | 27 | soc { |
| 28 | ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>; | 28 | ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000 |
| 29 | MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>; | ||
| 29 | 30 | ||
| 30 | internal-regs { | 31 | internal-regs { |
| 31 | serial@12000 { | 32 | serial@12000 { |
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts index dd0ba018b628..0b3acf378a95 100644 --- a/arch/arm/boot/dts/armada-370-rd.dts +++ b/arch/arm/boot/dts/armada-370-rd.dts | |||
| @@ -28,7 +28,8 @@ | |||
| 28 | }; | 28 | }; |
| 29 | 29 | ||
| 30 | soc { | 30 | soc { |
| 31 | ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>; | 31 | ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000 |
| 32 | MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>; | ||
| 32 | 33 | ||
| 33 | internal-regs { | 34 | internal-regs { |
| 34 | serial@12000 { | 35 | serial@12000 { |
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 4b54e511baef..bd21d497c13f 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi | |||
| @@ -31,6 +31,11 @@ | |||
| 31 | soc { | 31 | soc { |
| 32 | compatible = "marvell,armada370-mbus", "simple-bus"; | 32 | compatible = "marvell,armada370-mbus", "simple-bus"; |
| 33 | 33 | ||
| 34 | bootrom { | ||
| 35 | compatible = "marvell,bootrom"; | ||
| 36 | reg = <MBUS_ID(0x01, 0xe0) 0 0x100000>; | ||
| 37 | }; | ||
| 38 | |||
| 34 | internal-regs { | 39 | internal-regs { |
| 35 | system-controller@18200 { | 40 | system-controller@18200 { |
| 36 | compatible = "marvell,armada-370-xp-system-controller"; | 41 | 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 0d4ce54d0c2d..857f27214a7b 100644 --- a/arch/arm/boot/dts/armada-xp-db.dts +++ b/arch/arm/boot/dts/armada-xp-db.dts | |||
| @@ -30,7 +30,8 @@ | |||
| 30 | }; | 30 | }; |
| 31 | 31 | ||
| 32 | soc { | 32 | soc { |
| 33 | ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>; | 33 | ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000 |
| 34 | MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>; | ||
| 34 | 35 | ||
| 35 | internal-regs { | 36 | internal-regs { |
| 36 | serial@12000 { | 37 | serial@12000 { |
diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts index 2fa920987780..934dc46645db 100644 --- a/arch/arm/boot/dts/armada-xp-gp.dts +++ b/arch/arm/boot/dts/armada-xp-gp.dts | |||
| @@ -39,7 +39,8 @@ | |||
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | soc { | 41 | soc { |
| 42 | ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>; | 42 | ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000 |
| 43 | MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>; | ||
| 43 | 44 | ||
| 44 | internal-regs { | 45 | internal-regs { |
| 45 | serial@12000 { | 46 | 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 a3e3a1290ff5..1700f6fd6127 100644 --- 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 @@ | |||
| 27 | }; | 27 | }; |
| 28 | 28 | ||
| 29 | soc { | 29 | soc { |
| 30 | ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>; | 30 | ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000 |
| 31 | MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>; | ||
| 31 | 32 | ||
| 32 | internal-regs { | 33 | internal-regs { |
| 33 | serial@12000 { | 34 | serial@12000 { |
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index 803382497c35..7ba99ce107bb 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi | |||
| @@ -29,6 +29,11 @@ | |||
| 29 | soc { | 29 | soc { |
| 30 | compatible = "marvell,armadaxp-mbus", "simple-bus"; | 30 | compatible = "marvell,armadaxp-mbus", "simple-bus"; |
| 31 | 31 | ||
| 32 | bootrom { | ||
| 33 | compatible = "marvell,bootrom"; | ||
| 34 | reg = <MBUS_ID(0x01, 0x1d) 0 0x100000>; | ||
| 35 | }; | ||
| 36 | |||
| 32 | internal-regs { | 37 | internal-regs { |
| 33 | L2: l2-cache { | 38 | L2: l2-cache { |
| 34 | compatible = "marvell,aurora-system-cache"; | 39 | compatible = "marvell,aurora-system-cache"; |