diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-03-03 09:41:03 -0500 |
---|---|---|
committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2015-03-04 09:09:27 -0500 |
commit | 24c2573bdb9203259a822a4e3ed90795b273d3ab (patch) | |
tree | be00b36d296afa5dd7249bf5de9f8c3c50cf77d6 | |
parent | 9552203cb08b9802e17f19bd5c786d6a2281a04a (diff) |
ARM: mvebu: fix unit address of MPIC nodes
The Device Tree nodes describing the MPIC nodes on Armada 370, 375,
38x and XP had a unit address that did not match the first reg
property, as suggested by the ePAPR. This commit fixes that.
[gregory.clement@free-electrons.com: removed the armada-38x part, as it
was already applied by a previous patch]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
-rw-r--r-- | arch/arm/boot/dts/armada-370-xp.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-370.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-375.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 1058cf6898fd..7b3393e264f8 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi | |||
@@ -223,7 +223,7 @@ | |||
223 | <0x20250 0x8>; | 223 | <0x20250 0x8>; |
224 | }; | 224 | }; |
225 | 225 | ||
226 | mpic: interrupt-controller@20000 { | 226 | mpic: interrupt-controller@20a00 { |
227 | compatible = "marvell,mpic"; | 227 | compatible = "marvell,mpic"; |
228 | #interrupt-cells = <1>; | 228 | #interrupt-cells = <1>; |
229 | #size-cells = <1>; | 229 | #size-cells = <1>; |
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 27397f151def..50f259b20f94 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi | |||
@@ -232,7 +232,7 @@ | |||
232 | reg = <0x18330 0x4>; | 232 | reg = <0x18330 0x4>; |
233 | }; | 233 | }; |
234 | 234 | ||
235 | interrupt-controller@20000 { | 235 | interrupt-controller@20a00 { |
236 | reg = <0x20a00 0x1d0>, <0x21870 0x58>; | 236 | reg = <0x20a00 0x1d0>, <0x21870 0x58>; |
237 | }; | 237 | }; |
238 | 238 | ||
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi index 64206939bde5..c6fedf2bfe3d 100644 --- a/arch/arm/boot/dts/armada-375.dtsi +++ b/arch/arm/boot/dts/armada-375.dtsi | |||
@@ -394,7 +394,7 @@ | |||
394 | reg = <0x20000 0x100>, <0x20180 0x20>; | 394 | reg = <0x20000 0x100>, <0x20180 0x20>; |
395 | }; | 395 | }; |
396 | 396 | ||
397 | mpic: interrupt-controller@20000 { | 397 | mpic: interrupt-controller@20a00 { |
398 | compatible = "marvell,mpic"; | 398 | compatible = "marvell,mpic"; |
399 | reg = <0x20a00 0x2d0>, <0x21070 0x58>; | 399 | reg = <0x20a00 0x2d0>, <0x21070 0x58>; |
400 | #interrupt-cells = <1>; | 400 | #interrupt-cells = <1>; |
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index bbabee5dd9b5..ff47345e19ed 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi | |||
@@ -154,7 +154,7 @@ | |||
154 | clocks = <&coreclk 1>; | 154 | clocks = <&coreclk 1>; |
155 | }; | 155 | }; |
156 | 156 | ||
157 | interrupt-controller@20000 { | 157 | interrupt-controller@20a00 { |
158 | reg = <0x20a00 0x2d0>, <0x21070 0x58>; | 158 | reg = <0x20a00 0x2d0>, <0x21070 0x58>; |
159 | }; | 159 | }; |
160 | 160 | ||