ramips: dts: Unify naming of gpio-keys nodes

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

diff --git a/target/linux/ramips/dts/MicroWRT.dts b/target/linux/ramips/dts/MicroWRT.dts
index 584cd1cb9b36f457e21305267c80827a4d001cd0..a010a9c6262b34ef17af29484f8a0ea487287937 100644 (file)
--- a/target/linux/ramips/dts/MicroWRT.dts
+++ b/target/linux/ramips/dts/MicroWRT.dts
@@ -2,30 +2,31 @@
 
 #include "mt7620a.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
 / {
-       compatible = "microwrt", "ralink,mt7620a-soc";
+       compatible = "microduino,microwrt", "ralink,mt7620a-soc";
        model = "Microduino MicroWRT";
 
        chosen {
                bootargs = "console=ttyS0,115200";
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 1 1>;
-                       linux,code = <0x198>;
+                       gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio0 2 1>;
-                       linux,code = <0x211>;
+                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 };
@@ -42,34 +43,38 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
-               reg = <0 0>;
-               linux,modalias = "m25p80", "w25q128";
+               reg = <0>;
                spi-max-frequency = <10000000>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x0 0x20000>;
-                       read-only;
-               };
-
-               partition@20000 {
-                       label = "u-boot-env";
-                       reg = <0x20000 0x10000>;
-                       read-only;
-               };
-
-               factory: partition@30000 {
-                       label = "factory";
-                       reg = <0x30000 0x10000>;
-                       read-only;
-               };
-
-               partition@40000 {
-                       label = "firmware";
-                       reg = <0x40000 0xfc0000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x20000>;
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               label = "u-boot-env";
+                               reg = <0x20000 0x10000>;
+                               read-only;
+                       };
+
+                       factory: partition@30000 {
+                               label = "factory";
+                               reg = <0x30000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@40000 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               reg = <0x40000 0xfc0000>;
+                       };
                };
        };
 };
@@ -82,10 +87,6 @@
        status = "okay";
 };
 
-&pcie {
-       status = "okay";
-};
-
 &ethernet {
        pinctrl-names = "default";
        pinctrl-0 = <&ephy_pins>;