ramips: move dts-v1 statement to top-level DTSI files

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / mt7621_storylink_sap-g3200u3.dts

diff --git a/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts b/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts
index d1d6a534b6f29334234892558f5b35fd9658ec7d..e40d999412ffdb4c77aae531b30824c4f927402c 100644 (file)
--- a/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts
+++ b/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7621.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -9,39 +7,29 @@
        compatible = "storylink,sap-g3200u3", "mediatek,mt7621-soc";
        model = "STORYLiNK SAP-G3200U3";
 
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x8000000>;
-       };
-
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        leds {
                compatible = "gpio-leds";
 
                usb {
                        label = "sap-g3200u3:green:usb";
-                       gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
                        linux,default-trigger = "usbport";
                };
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                rfkill {
                        label = "rfkill";
-                       gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RFKILL>;
                };
        };
@@ -50,7 +38,7 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -113,15 +101,44 @@
        };
 };
 
-&ethernet {
+&gmac0 {
        mtd-mac-address = <&factory 0xe006>;
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "uart3", "jtag";
-                       ralink,function = "gpio";
+&switch0 {
+       ports {
+               port@0 {
+                       status = "okay";
+                       label = "lan1";
+               };
+
+               port@1 {
+                       status = "okay";
+                       label = "lan2";
+               };
+
+               port@2 {
+                       status = "okay";
+                       label = "lan3";
+               };
+
+               port@3 {
+                       status = "okay";
+                       label = "lan4";
+               };
+
+               port@4 {
+                       status = "okay";
+                       label = "wan";
+                       mtd-mac-address = <&factory 0xe006>;
+                       mtd-mac-address-increment = <1>;
                };
        };
 };
+
+&state_default {
+       gpio {
+               groups = "uart3", "jtag";
+               function = "gpio";
+       };
+};