From abc917083bbd6e32929d3939d36f14107a689ce1 Mon Sep 17 00:00:00 2001
From: Andrew Lunn <andrew@lunn.ch>
Date: Sat, 17 Nov 2012 17:00:44 +0100
Subject: [PATCH] --- yaml --- r: 342345 b: refs/heads/master c:
 f9e7592230b72acb703e6c29691d587341b6c710 h: refs/heads/master i:   342343:
 f52ec742d892b48004a3cff37fd7e05da5a98eb3 v: v3

---
 [refs]                                |  2 +-
 trunk/arch/arm/Kconfig                |  2 ++
 trunk/arch/arm/boot/dts/kirkwood.dtsi | 10 ++++++++--
 trunk/arch/arm/plat-orion/irq.c       |  6 +-----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index eafbfa1c6793..b6f50abb4e39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49e928d6cfd4a27f2b2e0ea6cdcb9e853360a9a1
+refs/heads/master: f9e7592230b72acb703e6c29691d587341b6c710
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index ca2b4182061a..3cf5742a23ca 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -549,6 +549,8 @@ config ARCH_KIRKWOOD
 	select CPU_FEROCEON
 	select GENERIC_CLOCKEVENTS
 	select PCI
+	select PINCTRL
+	select PINCTRL_KIRKWOOD
 	select PLAT_ORION_LEGACY
 	help
 	  Support for the following Marvell Kirkwood series SoCs:
diff --git a/trunk/arch/arm/boot/dts/kirkwood.dtsi b/trunk/arch/arm/boot/dts/kirkwood.dtsi
index 4fc7a8e49168..a990c30f0a26 100644
--- a/trunk/arch/arm/boot/dts/kirkwood.dtsi
+++ b/trunk/arch/arm/boot/dts/kirkwood.dtsi
@@ -4,6 +4,10 @@
 	compatible = "marvell,kirkwood";
 	interrupt-parent = <&intc>;
 
+	aliases {
+	       gpio0 = &gpio0;
+	       gpio1 = &gpio1;
+	};
 	intc: interrupt-controller {
 		compatible = "marvell,orion-intc", "marvell,intc";
 		interrupt-controller;
@@ -24,7 +28,8 @@
 			#gpio-cells = <2>;
 			gpio-controller;
 			reg = <0x10100 0x40>;
-			ngpio = <32>;
+			ngpios = <32>;
+			interrupt-controller;
 			interrupts = <35>, <36>, <37>, <38>;
 		};
 
@@ -33,7 +38,8 @@
 			#gpio-cells = <2>;
 			gpio-controller;
 			reg = <0x10140 0x40>;
-			ngpio = <18>;
+			ngpios = <18>;
+			interrupt-controller;
 			interrupts = <39>, <40>, <41>;
 		};
 
diff --git a/trunk/arch/arm/plat-orion/irq.c b/trunk/arch/arm/plat-orion/irq.c
index 1867944415ca..8db0b981ca64 100644
--- a/trunk/arch/arm/plat-orion/irq.c
+++ b/trunk/arch/arm/plat-orion/irq.c
@@ -41,7 +41,7 @@ void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr)
 static int __init orion_add_irq_domain(struct device_node *np,
 				       struct device_node *interrupt_parent)
 {
-	int i = 0, irq_gpio;
+	int i = 0;
 	void __iomem *base;
 
 	do {
@@ -54,10 +54,6 @@ static int __init orion_add_irq_domain(struct device_node *np,
 
 	irq_domain_add_legacy(np, i * 32, 0, 0,
 			      &irq_domain_simple_ops, NULL);
-
-	irq_gpio = i * 32;
-	orion_gpio_of_init(irq_gpio);
-
 	return 0;
 }