1 files changed, 71 insertions, 40 deletions

diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
index e6a102cf424c..4d2a8db9ab77 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@@ -1,3 +1,14 @@
+/*
+ * Device Tree file for NETGEAR ReadyNAS Duo v2
+ *
+ * Copyright (C) 2013, Arnaud EBALARD <arno@natisbad.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
 /dts-v1/;
 
 #include "kirkwood.dtsi"
@@ -32,41 +43,50 @@
                                 marvell,pins = "mpp47";
                                 marvell,function = "gpio";
                         };
+
                         pmx_button_backup: pmx-button-backup {
                                 marvell,pins = "mpp45";
                                 marvell,function = "gpio";
                         };
+
                         pmx_button_reset: pmx-button-reset {
                                 marvell,pins = "mpp13";
                                 marvell,function = "gpio";
                         };
+
                         pmx_led_blue_power: pmx-led-blue-power {
                                 marvell,pins = "mpp31";
                                 marvell,function = "gpio";
                         };
+
                         pmx_led_blue_activity: pmx-led-blue-activity {
                                 marvell,pins = "mpp38";
                                 marvell,function = "gpio";
                         };
+
                         pmx_led_blue_disk1: pmx-led-blue-disk1 {
                                 marvell,pins = "mpp23";
                                 marvell,function = "gpio";
                         };
+
                         pmx_led_blue_disk2: pmx-led-blue-disk2 {
                                 marvell,pins = "mpp22";
                                 marvell,function = "gpio";
                         };
+
                         pmx_led_blue_backup: pmx-led-blue-backup {
                                 marvell,pins = "mpp29";
                                 marvell,function = "gpio";
                         };
+
+                        pmx_poweroff: pmx-poweroff {
+                                marvell,pins = "mpp30";
+                                marvell,function = "gpio";
+                        };
                 };
 
                 clocks {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       g762_clk: fixedclk {
+                       g762_clk: g762-oscillator {
                                  compatible = "fixed-clock";
                                  #clock-cells = <0>;
                                  clock-frequency = <8192>;
@@ -112,69 +132,80 @@
 
                 power_led {
                         label = "status:blue:power_led";
-                        gpios = <&gpio0 31 1>;   /* GPIO 31 Active Low */
-                        linux,default-trigger = "default-on";
+                        gpios = <&gpio0 31 GPIO_ACTIVE_LOW>;
+                        default-state = "keep";
                 };
+
                 activity_led {
                         label = "status:blue:activity_led";
-                        gpios = <&gpio1 6 1>;    /* GPIO 38 Active Low */
+                        gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
                 };
+
                 disk1_led {
                         label = "status:blue:disk1_led";
-                        gpios = <&gpio0 23 1>;   /* GPIO 23 Active Low */
+                        gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
                 };
+
                 disk2_led {
                         label = "status:blue:disk2_led";
-                        gpios = <&gpio0 22 1>;   /* GPIO 22 Active Low */
+                        gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
                 };
+
                 backup_led {
                         label = "status:blue:backup_led";
-                        gpios = <&gpio0 29 1>;   /* GPIO 29 Active Low*/
+                        gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
                 };
         };
 
-        gpio_keys {
+        gpio-keys {
                 compatible = "gpio-keys";
-                #address-cells = <1>;
-                #size-cells = <0>;
                 pinctrl-0 = <&pmx_button_power &pmx_button_backup
                              &pmx_button_reset>;
                 pinctrl-names = "default";
 
-                button@1 {
+                power-button {
                         label = "Power Button";
-                        linux,code = <116>;     /* KEY_POWER */
-                        gpios = <&gpio1 15 1>;
+                        linux,code = <KEY_POWER>;
+                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                 };
-                button@2 {
+
+                reset-button {
                         label = "Reset Button";
-                        linux,code = <0x198>;   /* KEY_RESTART */
-                        gpios = <&gpio0 13 1>;
+                        linux,code = <KEY_RESTART>;
+                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                 };
-                button@3 {
+
+                backup-button {
                         label = "Backup Button";
-                        linux,code = <133>;     /* KEY_COPY */
-                        gpios = <&gpio1 13 1>;
+                        linux,code = <KEY_COPY>;
+                        gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
                 };
         };
 
-        regulators {
-                compatible = "simple-bus";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                usb_power: regulator@1 {
-                        compatible = "regulator-fixed";
-                        reg = <1>;
-                        regulator-name = "USB 3.0 Power";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                        enable-active-high;
-                        regulator-always-on;
-                        regulator-boot-on;
-                        gpio = <&gpio1 14 0>;
-                };
-        };
+        gpio-poweroff {
+                compatible = "gpio-poweroff";
+                pinctrl-0 = <&pmx_poweroff>;
+                pinctrl-names = "default";
+                gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;
+        };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                usb3_regulator: usb3-regulator {
+                        compatible = "regulator-fixed";
+                        reg = <1>;
+                        regulator-name = "USB 3.0 Power";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        enable-active-high;
+                        regulator-always-on;
+                        regulator-boot-on;
+                        gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+                };
+        };
 };
 
 &nand {
@@ -210,7 +241,7 @@
 &mdio {
         status = "okay";
 
-        ethphy0: ethernet-phy@0 {
+        ethphy0: ethernet-phy@0 { /* Marvell 88E1318 */
                 device_type = "ethernet-phy";
                 reg = <0>;
         };