commit be3cd268d1d1837aaed937c2fc85b3d39d2f1b50
author Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tue Apr 09 23:26:18 2013 +0200
committer Jason Cooper <jason@lakedaemon.net> Mon May 13 15:57:29 2013 +0000
tree ee9f08cea04c5b8bc759678d7129f8eaf08695bf
parent f722406faae2d073cc1d01063d1123c35425939e

ARM: mvebu: do not duplicate the mpic alias

The mpic alias is already defined in the common armada-370-xp.dtsi, so
there's no need to repeat it at the armada-xp.dtsi and armada-370.dtsi
level.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

arch/arm/boot/dts/armada-370.dtsi

diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index b2c1b5a..0c9130b 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -43,7 +43,7 @@
 				wt-override;
 			};
 
-			mpic: interrupt-controller@20000 {
+			interrupt-controller@20000 {
 				reg = <0x20a00 0x1d0>, <0x21870 0x58>;
 			};