ARM: Kirkwood: Convert NSA310 to DT based regulators.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
index 5509f96595466552cb84c20be6eb0f81f5bd9832..2dc1d0929e89d382508337b7758ca6d7de15a6c7 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/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/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c
index 2fa71400ecb3af1eb395a84035bcbe4e96c1f64c..891322b44633e9738f864e5f29bd0cfd80c2f1ba 100644 (file)
--- a/arch/arm/mach-kirkwood/board-nsa310.c
+++ b/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)