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

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / mt7621_telco-electronics_x1.dts

diff --git a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
index abba2ea8b1cd4ae06089af8f58ea086e0b4acce6..29aeb85b1903ccc44c5c667cae3c0b3c374d65b7 100644 (file)
--- a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
+++ b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-/dts-v1/;
-
 #include "mt7621.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -23,12 +21,11 @@
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -38,47 +35,47 @@
 
                system_led: system {
                        label = "x1:green:system";
-                       gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
                };
 
                modem_offline {
                        label = "x1:red:modem-offline";
-                       gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
                };
 
                modem_4g {
                        label = "x1:blue:modem-4g";
-                       gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
                };
 
                modem_3g {
                        label = "x1:green:modem-3g";
-                       gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
                };
 
                modem_rssi_lowest {
                        label = "x1:green:modem-rssi-lowest";
-                       gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                };
 
                modem_rssi_low {
                        label = "x1:green:modem-rssi-low";
-                       gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
                };
 
                modem_rssi_medium {
                        label = "x1:green:modem-rssi-medium";
-                       gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
                };
 
                modem_rssi_high {
                        label = "x1:green:modem-rssi-high";
-                       gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
                };
 
                modem_rssi_highest {
                        label = "x1:green:modem-rssi-highest";
-                       gpios = <&gpio0 31 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 31 GPIO_ACTIVE_LOW>;
                };
        };
 };
@@ -123,24 +120,52 @@
        };
 };
 
-&gpio0 {
+&gpio {
        status = "okay";
 };
 
-&ethernet {
+&gmac0 {
        mtd-mac-address = <&factory 0xe006>;
-       mediatek,portmap = "llllw";
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "jtag", "uart2", "wdt", "rgmii2";
-                       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 = "wdt", "rgmii2";
+               function = "gpio";
+       };
+};
+
 &pcie {
        status = "okay";