ramips: dts: Unify naming of gpio-keys nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / E1700.dts

diff --git a/target/linux/ramips/dts/E1700.dts b/target/linux/ramips/dts/E1700.dts
index 8b4361af87d2a87d9d9574c5ef12f4e100250e50..04aabaf202c208e8e3850ac95b3cd3543e105f69 100644 (file)
--- a/target/linux/ramips/dts/E1700.dts
+++ b/target/linux/ramips/dts/E1700.dts
@@ -10,145 +10,154 @@
 
 /dts-v1/;
 
-/include/ "mt7620a.dtsi"
+#include "mt7620a.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 
 / {
        compatible = "linksys,e1700", "ralink,mt7620a-soc";
        model = "Linksys E1700";
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               compatible = "jedec,spi-nor";
-                               reg = <0 0>;
-                               linux,modalias = "m25p80", "mx25l6405d";
-                               spi-max-frequency = <10000000>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0 0x30000>;
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       label = "config";
-                                       reg = <0x30000 0x10000>;
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       label = "factory";
-                                       reg = <0x40000 0x10000>;
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       label = "firmware";
-                                       reg = <0x50000 0x7b0000>;
-                               };
-                       };
-               };
+       aliases {
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "uartf";
-                               ralink,function = "gpio";
-                       };
+       keys {
+               compatible = "gpio-keys-polled";
+               poll-interval = <20>;
+
+               reset {
+                       label = "reset";
+                       gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
+                       linux,code = <KEY_RESTART>;
+               };
+
+               wps {
+                       label = "wps";
+                       gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 
-       ethernet@10100000 {
-               status = "okay";
-               mtd-mac-address = <&factory 0x28>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
+       gpio-leds {
+               compatible = "gpio-leds";
 
-               port@5 {
-                       status = "okay";
-                       mediatek,fixed-link = <1000 1 1 1>;
-                       phy-mode = "rgmii";
+               led_power: power {
+                       label = "e1700:green:power";
+                       gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+               };
+
+               wan {
+                       label = "e1700:green:wps";
+                       gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
                };
+       };
+};
 
-               mdio-bus {
-                       status = "okay";
+&spi0 {
+       status = "okay";
 
-                       phy0: ethernet-phy@0 {
-                               reg = <0>;
-                               phy-mode = "rgmii";
-                       };
+       m25p80@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <10000000>;
 
-                       phy1: ethernet-phy@1 {
-                               reg = <1>;
-                               phy-mode = "rgmii";
-                       };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-                       phy2: ethernet-phy@2 {
-                               reg = <2>;
-                               phy-mode = "rgmii";
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x30000>;
+                               read-only;
                        };
 
-                       phy3: ethernet-phy@3 {
-                               reg = <3>;
-                               phy-mode = "rgmii";
+                       partition@30000 {
+                               label = "config";
+                               reg = <0x30000 0x10000>;
+                               read-only;
                        };
 
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                               phy-mode = "rgmii";
+                       factory: partition@40000 {
+                               label = "factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
                        };
 
-                       phy1f: ethernet-phy@1f {
-                               reg = <0x1f>;
-                               phy-mode = "rgmii";
+                       partition@50000 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               reg = <0x50000 0x7b0000>;
                        };
                };
        };
+};
 
-       gsw@10110000 {
-               mediatek,port4 = "gmac";
-               mediatek,mt7530 = <1>;
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "uartf";
+                       ralink,function = "gpio";
+               };
        };
+};
 
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
+&ethernet {
+       status = "okay";
+       mtd-mac-address = <&factory 0x28>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
+
+       port@5 {
+               status = "okay";
+               mediatek,fixed-link = <1000 1 1 1>;
+               phy-mode = "rgmii";
        };
 
-       gpio-keys-polled {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               poll-interval = <20>;
+       mdio-bus {
+               status = "okay";
 
-               reset {
-                       label = "reset";
-                       gpios = <&gpio0 1 0>;
-                       linux,code = <0x198>;
+               phy0: ethernet-phy@0 {
+                       reg = <0>;
+                       phy-mode = "rgmii";
                };
 
-               wps {
-                       label = "wps";
-                       gpios = <&gpio0 2 0>;
-                       linux,code = <0x211>;
+               phy1: ethernet-phy@1 {
+                       reg = <1>;
+                       phy-mode = "rgmii";
                };
-       };
 
-       gpio-leds {
-               compatible = "gpio-leds";
+               phy2: ethernet-phy@2 {
+                       reg = <2>;
+                       phy-mode = "rgmii";
+               };
 
-               power {
-                       label = "e1700:green:power";
-                       gpios = <&gpio0 10 1>;
+               phy3: ethernet-phy@3 {
+                       reg = <3>;
+                       phy-mode = "rgmii";
                };
 
-               wan {
-                       label = "e1700:green:wps";
-                       gpios = <&gpio0 12 1>;
+               phy4: ethernet-phy@4 {
+                       reg = <4>;
+                       phy-mode = "rgmii";
+               };
+
+               phy1f: ethernet-phy@1f {
+                       reg = <0x1f>;
+                       phy-mode = "rgmii";
                };
        };
 };
+
+&gsw {
+       mediatek,port4 = "gmac";
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};