From e2d697f16b121ef16923328bf447309fdac962e9 Mon Sep 17 00:00:00 2001
From: Andrew Lunn <andrew@lunn.ch>
Date: Fri, 28 Dec 2012 15:08:48 +0100
Subject: [PATCH] --- yaml --- r: 359939 b: refs/heads/master c:
 12131b5424577b2eb1bef5a41220d310594e42dc h: refs/heads/master i:   359937:
 cd8f4dca3cf4ca0685ccd831b752769a634c769e   359935:
 6ffb6bdf5f0fab6e6d187a005954665f2fa590cc v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/arm/boot/dts/kirkwood-nsa310.dts | 17 +++++++++++++++++
 trunk/arch/arm/mach-kirkwood/board-nsa310.c |  4 ----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 28041e9787e2..d9e1c01caa46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41e364bb2494afe21803aff43bd8cb89ce6fc097
+refs/heads/master: 12131b5424577b2eb1bef5a41220d310594e42dc
diff --git a/trunk/arch/arm/boot/dts/kirkwood-nsa310.dts b/trunk/arch/arm/boot/dts/kirkwood-nsa310.dts
index 5509f9659546..2dc1d0929e89 100644
--- a/trunk/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/trunk/arch/arm/boot/dts/kirkwood-nsa310.dts
@@ -141,4 +141,21 @@
 			gpios = <&gpio1 8 0>;
 		};
 	};
+
+	regulators {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		usb0_power_off: regulator@1 {
+			compatible = "regulator-fixed";
+			reg = <1>;
+			regulator-name = "USB Power Off";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			regulator-always-on;
+			regulator-boot-on;
+			gpio = <&gpio0 21 0>;
+		};
+	};
 };
diff --git a/trunk/arch/arm/mach-kirkwood/board-nsa310.c b/trunk/arch/arm/mach-kirkwood/board-nsa310.c
index 2fa71400ecb3..891322b44633 100644
--- a/trunk/arch/arm/mach-kirkwood/board-nsa310.c
+++ b/trunk/arch/arm/mach-kirkwood/board-nsa310.c
@@ -17,7 +17,6 @@
 #include "common.h"
 #include "mpp.h"
 
-#define NSA310_GPIO_USB_POWER_OFF	21
 #define NSA310_GPIO_POWER_OFF		48
 
 static unsigned int nsa310_mpp_config[] __initdata = {
@@ -70,9 +69,6 @@ static void __init nsa310_gpio_init(void)
 				  "Power Off");
 	if (!err)
 		pm_power_off = nsa310_power_off;
-
-	nsa310_gpio_request(NSA310_GPIO_USB_POWER_OFF, GPIOF_OUT_INIT_LOW,
-			    "USB Power Off");
 }
 
 void __init nsa310_init(void)