From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Thu, 26 Feb 2015 09:51:17 +0000 (+0100)
Subject: ARM: mvebu: Fix MPIC unit address
X-Git-Tag: v4.1-rc1~50^2~39^2~11
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1d7b0839941c6ee883c001716611949448f20a79;p=linux.git

ARM: mvebu: Fix MPIC unit address

The unit-address is supposed to be equal the first reg address, which is not
the case for the MPIC, that uses the mbus-controller one. Fix this.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---

diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index cb30fb82a046..a7f2c7b2529c 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -368,7 +368,7 @@ mbusc: mbus-controller@20000 {
 				reg = <0x20000 0x100>, <0x20180 0x20>;
 			};
 
-			mpic: interrupt-controller@20000 {
+			mpic: interrupt-controller@20a00 {
 				compatible = "marvell,mpic";
 				reg = <0x20a00 0x2d0>, <0x21070 0x58>;
 				#interrupt-cells = <1>;