ramips: fix mt7628 eval board pinmux

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

diff --git a/target/linux/ramips/dts/NA930.dts b/target/linux/ramips/dts/NA930.dts
index ade33564773072c39764182cc1a18e0ba3cd9be7..be909cf3349a65d5d6197073d6950a50152a5848 100644 (file)
--- a/target/linux/ramips/dts/NA930.dts
+++ b/target/linux/ramips/dts/NA930.dts
@@ -1,43 +1,18 @@
 /dts-v1/;
 
-/include/ "mt7620a.dtsi"
+#include "mt7620a.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 
 / {
-       compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc";
+       compatible = "sercomm,na930", "ralink,mt7620a-soc";
        model = "Sercomm NA930";
 
        chosen {
                bootargs = "console=ttyS1,57600";
        };
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "rgmii2", "spi", "ephy";
-                               ralink,function = "gpio";
-                       };
-
-                       uartf_gpio {
-                               ralink,group = "uartf";
-                               ralink,function = "gpio uartf";
-                       };
-               };
-       };
-
-       palmbus@10000000 {
-               uart@500 {
-                       status = "okay";
-               };
-
-               gpio@638 {
-                       status = "okay";
-               };
-
-               gpio@660 {
-                       status = "okay";
-               };
-       };
-
        nand {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -67,39 +42,6 @@
                };
        };
 
-       ethernet@10100000 {
-               status = "okay";
-               pinctrl-names = "default";
-               pinctrl-0 = <&rgmii1_pins &mdio_pins>;
-               mediatek,portmap = "llllw";
-
-               port@4 {
-                       status = "okay";
-                       phy-handle = <&phy4>;
-                       phy-mode = "rgmii";
-               };
-
-               port@5 {
-                       status = "okay";
-                       phy-handle = <&phy5>;
-                       phy-mode = "rgmii";
-               };
-
-               mdio-bus {
-                       status = "okay";
-
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                               phy-mode = "rgmii";
-                       };
-
-                       phy5: ethernet-phy@5 {
-                               reg = <5>;
-                               phy-mode = "rgmii";
-                       };
-               };
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
@@ -108,20 +50,20 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 11 1>;
-                       linux,code = <0x198>;
+                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
                };
 
                zwave {
                        label = "zwave";
-                       gpios = <&gpio0 12 1>;
-                       linux,code = <0x100>;
+                       gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+                       linux,code = <BTN_0>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio0 14 1>;
-                       linux,code = <0x211>;
+                       gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 
@@ -130,22 +72,22 @@
 
                zwave {
                        label = "na930:blue:zwave";
-                       gpios = <&gpio2 0 1>;
+                       gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
                };
 
                status {
                        label = "na930:blue:status";
-                       gpios = <&gpio2 26 1>;
+                       gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
                };
 
                service {
                        label = "na930:blue:service";
-                       gpios = <&gpio2 28 1>;
+                       gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
                };
 
                power {
                        label = "na930:blue:power";
-                       gpios = <&gpio2 29 1>;
+                       gpios = <&gpio2 29 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -156,19 +98,78 @@
                telit {
                        gpio-export,name = "telit";
                        gpio-export,output = <1>;
-                       gpios = <&gpio0 13 0>;
+                       gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "rgmii2", "spi", "ephy";
+                       ralink,function = "gpio";
+               };
+
+               uartf_gpio {
+                       ralink,group = "uartf";
+                       ralink,function = "gpio uartf";
                };
        };
+};
+
+&uart {
+       status = "okay";
+};
+
+&gpio1 {
+       status = "okay";
+};
+
+&gpio2 {
+       status = "okay";
+};
+
+&ethernet {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&rgmii1_pins &mdio_pins>;
+       mediatek,portmap = "llllw";
 
-       gsw@10110000 {
-               mediatek,port4 = "gmac";
+       port@4 {
+               status = "okay";
+               phy-handle = <&phy4>;
+               phy-mode = "rgmii";
        };
 
-       ehci@101c0000 {
+       port@5 {
                status = "okay";
+               phy-handle = <&phy5>;
+               phy-mode = "rgmii";
        };
 
-       ohci@101c1000 {
+       mdio-bus {
                status = "okay";
+
+               phy4: ethernet-phy@4 {
+                       reg = <4>;
+                       phy-mode = "rgmii";
+               };
+
+               phy5: ethernet-phy@5 {
+                       reg = <5>;
+                       phy-mode = "rgmii";
+               };
        };
 };
+
+&gsw {
+       mediatek,port4 = "gmac";
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};