From 88c70c9cd264984c810c1a6a4c356ae5d0315c80 Mon Sep 17 00:00:00 2001
From: Alexander Clouter <alex@digriz.org.uk>
Date: Tue, 26 Mar 2013 21:44:46 +0000
Subject: [PATCH] --- yaml --- r: 362115 b: refs/heads/master c:
 835f6322c691600da5b7fb526f07b1d21d0c88ef h: refs/heads/master i:   362113:
 837001cc1714d4538cdda886ffa15e544ef3b7c3   362111:
 a1d7791b5511f7db00ef25d65aedfceb4e73e288 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/boot/dts/orion5x.dtsi | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8affa38f201c..3416736d3724 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d0644ebc63bce3784ebea28d0355071b4e90525
+refs/heads/master: 835f6322c691600da5b7fb526f07b1d21d0c88ef
diff --git a/trunk/arch/arm/boot/dts/orion5x.dtsi b/trunk/arch/arm/boot/dts/orion5x.dtsi
index 8aad00f81ed9..7c2a3263c166 100644
--- a/trunk/arch/arm/boot/dts/orion5x.dtsi
+++ b/trunk/arch/arm/boot/dts/orion5x.dtsi
@@ -13,6 +13,9 @@
 	compatible = "marvell,orion5x";
 	interrupt-parent = <&intc>;
 
+	aliases {
+		gpio0 = &gpio0;
+	};
 	intc: interrupt-controller {
 		compatible = "marvell,orion-intc", "marvell,intc";
 		interrupt-controller;
@@ -32,7 +35,9 @@
 			#gpio-cells = <2>;
 			gpio-controller;
 			reg = <0x10100 0x40>;
-			ngpio = <32>;
+			ngpios = <32>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 			interrupts = <6>, <7>, <8>, <9>;
 		};