ramips: mt7628: update dts for upstream gpio-mt7621 driver

upstream driver merged 3 separated gpio banks into one gpio node.
and gpioX Y in our local driver should be replaced with gpio X*32+Y.

This patch is created using the following sed command:
sed -i -r 's/(.*)gpio([0-9]) ([0-9]+)(.*)/echo "\1gpio $((\2*32+\3))\4"/ge'

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>

diff --git a/target/linux/ramips/dts/mt7628an.dtsi b/target/linux/ramips/dts/mt7628an.dtsi
index 61016c8b4081235fefba6c37afa3b7fb1d5b2819..acbab706b5d4095de3b8ed6bcf158595c4a33e43 100644 (file)
--- a/target/linux/ramips/dts/mt7628an.dtsi
+++ b/target/linux/ramips/dts/mt7628an.dtsi
@@ -81,36 +81,18 @@
                        interrupts = <3>;
                };
 
-               gpio@600 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       compatible = "mtk,mt7628-gpio", "mtk,mt7621-gpio";
+               gpio: gpio@600 {
+                       compatible = "mediatek,mt7621-gpio";
                        reg = <0x600 0x100>;
 
                        interrupt-parent = <&intc>;
                        interrupts = <6>;
 
-                       gpio0: bank@0 {
-                               reg = <0>;
-                               compatible = "mtk,mt7621-gpio-bank";
-                               gpio-controller;
-                               #gpio-cells = <2>;
-                       };
-
-                       gpio1: bank@1 {
-                               reg = <1>;
-                               compatible = "mtk,mt7621-gpio-bank";
-                               gpio-controller;
-                               #gpio-cells = <2>;
-                       };
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
 
-                       gpio2: bank@2 {
-                               reg = <2>;
-                               compatible = "mtk,mt7621-gpio-bank";
-                               gpio-controller;
-                               #gpio-cells = <2>;
-                       };
+                       gpio-controller;
+                       #gpio-cells = <2>;
                };
 
                i2c: i2c@900 {

diff --git a/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts
index 3c38cc7b4641968e4566f227be72022935859c20..16ba37631144fec2e3e0e207f349f1cc7b5c4dc7 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts
+++ b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts
@@ -57,7 +57,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -67,12 +67,12 @@
 
                led_system: system {
                        label = "awusfree1:orange:system";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
                        label = "awusfree1:blue:wlan";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 };
@@ -89,10 +89,6 @@
        mtd-mac-address = <&factory 0x2e>;
 };
 
-&gpio1 {
-       status = "okay";
-};
-
 &ohci {
        status = "disabled";
 };

diff --git a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts
index 25c3c403d2452f87a9c93d244dc2b7a20375c0c1..f5118337577284dcb435c06f155f1134834ee517 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts
+++ b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts
@@ -21,20 +21,20 @@
 
                aoss {
                        label = "aoss";
-                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
 
                ap {
                        label = "ap";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_0>;
                        linux,input-type = <EV_SW>;
                };
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -44,42 +44,42 @@
 
                router_o {
                        label = "wcr-1166ds:orange:router";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
 
                router_g {
                        label = "wcr-1166ds:green:router";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                };
 
                internet_o {
                        label = "wcr-1166ds:orange:internet";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
 
                internet_g {
                        label = "wcr-1166ds:green:internet";
-                       gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
                };
 
                wireless_o {
                        label = "wcr-1166ds:orange:wireless";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
 
                wireless_g {
                        label = "wcr-1166ds:green:wireless";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
                diag {
                        label = "wcr-1166ds:orange:diag";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
                        label = "wcr-1166ds:green:power";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
index 71aefcb525b0a9f2bdd508eed2bdbdacf1c883ec..3d8bc15947689512e1724a24ed160362e032b236 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
+++ b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
@@ -22,13 +22,13 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "rfkill";
-                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
@@ -38,28 +38,28 @@
 
                lan1 {
                        label = "wr1000:blue:lan1";
-                       gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
                        label = "wr1000:blue:lan2";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
 
                wan {
                        label = "wr1000:blue:wan";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
                        label = "wr1000:blue:wlan2g";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                led_wps: wps {
                        label = "wr1000:blue:wps";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts b/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts
index bcc9d00519826a938375d71a411885c8f218aa31..955797a990799eb81e7d42e1ed94e651e05555ad 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts
+++ b/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts
@@ -29,14 +29,14 @@
 
                usb {
                        label = "pbr-d1:orange:usb";
-                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ohci_port1>, <&ehci_port1>;
                        linux,default-trigger = "usbport";
                };
 
                led_power: power {
                        label = "pbr-d1:orange:power";
-                       gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
        };
@@ -46,7 +46,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 38 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 70 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_duzun_dm06.dts b/target/linux/ramips/dts/mt7628an_duzun_dm06.dts
index 83f93e0de5af7d2f65dd34141a1f9a695347e1d6..7466c5fdab432c3a769a1b42621d191713081bdc 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_duzun_dm06.dts
+++ b/target/linux/ramips/dts/mt7628an_duzun_dm06.dts
@@ -14,13 +14,13 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
@@ -55,10 +55,6 @@
        };
 };
 
-&gpio1 {
-       status = "okay";
-};
-
 &i2c {
        status = "okay";
 

diff --git a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts
index 533f3b0dc3c1363afa7dd8c112def4d24121b3a4..2a8ae960f147ca89277aa8fc7dacf8a8438a2b97 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts
+++ b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts
@@ -27,17 +27,17 @@
                led_power: power {
                        label = "gl-mt300n-v2:green:power";
                        default-state = "on";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
                wan {
                        label = "gl-mt300n-v2:green:wan";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
                        label = "gl-mt300n-v2:red:wlan";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -46,19 +46,19 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                BTN_0 {
                        label = "BTN_0";
-                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_0>;
                };
 
                BTN_1 {
                        label = "BTN_1";
-                       gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_1>;
                };
        };
@@ -70,7 +70,7 @@
                usb {
                        gpio-export,name = "usb";
                        gpio-export,output = <1>;
-                       gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi b/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi
index b88f9e7356b11f0e508f97e180fffde9baa8fc0e..5e531dd63ee2829098338e4e4285308078449ec0 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi
+++ b/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi
@@ -24,12 +24,12 @@
 
                led_power_blue: power {
                        /* Name is set device-specific */
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
                led_wlan_white: wlan {
                        /* Name is set device-specific */
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
        };
@@ -39,7 +39,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts
index d0df692a3bd9a987db75d869a0b8c8259de15ca2..4bdb53a0ec8d42e1e06c11d0595545052019f64f 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts
+++ b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts
@@ -19,7 +19,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -29,7 +29,7 @@
 
                wlan {
                        label = "hlk-7628n:green:wlan";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts
index 3b6a92c01df6fa5461c1a3e1f23f1be2297ba1a9..5efa352896703f626ea2b09d26828fd637d1e855 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts
+++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts
@@ -11,17 +11,17 @@
 
                led_system: system {
                        label = "hc5661a:blue:system";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
                };
 
                internet {
                        label = "hc5661a:blue:internet";
-                       gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                };
 
                wlan2g {
                        label = "hc5661a:blue:wlan2g";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts
index 903029d10d7f3d4ac4fd050d565567182cdbf059..3783edb8ce6eb0864ad9632622b437617706783a 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts
+++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts
@@ -12,23 +12,23 @@
 
                led_system: system {
                        label = "hc5761a:blue:system";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
                };
 
                internet {
                        label = "hc5761a:blue:internet";
-                       gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                };
 
                wlan2g {
                        label = "hc5761a:blue:wlan2g";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan5g {
                        label = "hc5761a:blue:wlan5g";
-                       gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 40 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy1tpt";
                };
        };
@@ -40,7 +40,7 @@
                usb_power {
                        gpio-export,name = "usb_power";
                        gpio-export,output = <0>;
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts
index fbc8d9837a76358aba5087e66211ad17ebcc20cf..16d9b56fe358699df1b7679c1c07e1924e54986c 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts
+++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts
@@ -11,12 +11,12 @@
 
                led_system: system {
                        label = "hc5861b:green:system";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
                        label = "hc5861b:green:wlan2g";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi b/target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi
index 7a6631d2e4154cb3da8e3188f63c1569799933a0..7bd394c3464cfe0b469f2f7dde70b4f5d3b9ee97 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi
+++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi
@@ -24,7 +24,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_iptime.dtsi b/target/linux/ramips/dts/mt7628an_iptime.dtsi
index 8ee865ddff0a112b2785a85dcb1f8fdf9df0285b..311cab3039606e1dfdeda157df1a22d78b94f0da 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_iptime.dtsi
+++ b/target/linux/ramips/dts/mt7628an_iptime.dtsi
@@ -15,14 +15,14 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                        debounce-interval = <60>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 45 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                        debounce-interval = <60>;
                };

diff --git a/target/linux/ramips/dts/mt7628an_iptime_a3.dts b/target/linux/ramips/dts/mt7628an_iptime_a3.dts
index a4d8458ded22d8575012c2db6883640ce8e68691..6b124cc2c8fe20f2944bcbd336f841967e58bd3e 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_iptime_a3.dts
+++ b/target/linux/ramips/dts/mt7628an_iptime_a3.dts
@@ -19,12 +19,12 @@
 
                led_cpu: cpu {
                        label = "a3:blue:cpu";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
                        label = "a3:blue:wlan";
-                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_iptime_a604m.dts b/target/linux/ramips/dts/mt7628an_iptime_a604m.dts
index d9e0f8c593a769180f9df58be2acf7ad59d1f0be..7e2f53f0d40f4d118d5229748d6f42f61088cc91 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_iptime_a604m.dts
+++ b/target/linux/ramips/dts/mt7628an_iptime_a604m.dts
@@ -19,18 +19,18 @@
 
                wlan5g {
                        label = "a604m:blue:wlan5g";
-                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                led_cpu: cpu {
                        label = "a604m:blue:cpu";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
                        label = "a604m:blue:wlan2g";
-                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
index 229843fe1c90026f8b2507e152b2c7d32c9cc2d2..7fe47d98535215fbb1e4c861ddd4b951ae4dd82c 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
+++ b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
@@ -35,7 +35,7 @@
 
                led_wifi: wifi {
                        label = "linkit-smart-7688:orange:wifi";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -44,7 +44,7 @@
 
                wps {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts
index 22a8b566e2dcd0738439641c853aa8179e3d5a23..560690d6de397500917b4dc42c926a8683982cf8 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts
+++ b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts
@@ -25,7 +25,7 @@
 
                led_status: status {
                        label = "mac1200rv2:green:status";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
index dc9de9f4bf27071c0a8830b737a662deec116192..a7ea823583257e7652a66c82acb9a536d2742792 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
+++ b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
@@ -22,7 +22,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -32,32 +32,32 @@
 
                lan {
                        label = "r6120:green:lan";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
                        label = "r6120:green:power";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g_green {
                        label = "r6120:green:wlan2g";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g_orange {
                        label = "r6120:orange:wlan2g";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
 
                wan_green {
                        label = "r6120:green:wan";
-                       gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
                };
 
                wan_orange {
                        label = "r6120:orange:wan";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -65,7 +65,7 @@
                compatible = "regulator-fixed";
 
                regulator-name = "USB-power";
-               gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio 45 GPIO_ACTIVE_HIGH>;
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
                enable-active-high;

diff --git a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
index 89f00a3e672ae00bb7c9b13b5feaa1e472321816..679b8abee405fe87351de87eca86841fbea78f6f 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
+++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
@@ -21,7 +21,7 @@
                compatible = "gpio-leds";
 
                system_led: system {
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -30,7 +30,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_HIGH>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -88,14 +88,6 @@
        };
 };
 
-&gpio1 {
-       status = "okay";
-};
-
-&gpio2 {
-       status = "okay";
-};
-
 &spi0 {
        status = "okay";
 

diff --git a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts
index 01fe7025bb32e29d9d361a3222566a8dfd008b03..b0addf383b4a4ab0e2533eaf49b3fe8c90cb43d0 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts
+++ b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts
@@ -15,7 +15,7 @@
 
                wifi {
                        label = "rak633:blue:wifi";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
index 0efe14621a01f7ca41d32a2829d26403ba435a3e..229fefc52dbdf801248a6415de60c139d117cdf1 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
+++ b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
@@ -24,12 +24,12 @@
 
                led_power: wps {
                        label = "skw92a:green:wps";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
                        label = "skw92a:green:wlan";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -38,7 +38,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_tama_w06.dts b/target/linux/ramips/dts/mt7628an_tama_w06.dts
index 782e2dcd7f606f8a692e105fbca6ed758a2beb40..3d8365e90fa0a254769a820b88705bfdb61977c5 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tama_w06.dts
+++ b/target/linux/ramips/dts/mt7628an_tama_w06.dts
@@ -14,17 +14,17 @@
 
                wps {
                        label = "w06:green:wps";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wan {
                        label = "w06:green:wan";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
 
                wireless {
                        label = "w06:green:wlan";
-                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -33,7 +33,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_totolink_a3.dts b/target/linux/ramips/dts/mt7628an_totolink_a3.dts
index 87dd8559b7b4397ba054da5aa6b3f7d261c093a1..a5b8d9149988ffa7970805f1930d2f1ffccdff49 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_totolink_a3.dts
+++ b/target/linux/ramips/dts/mt7628an_totolink_a3.dts
@@ -19,12 +19,12 @@
 
                led_cpu: cpu {
                        label = "a3:blue:cpu";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
                        label = "a3:blue:wlan";
-                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts
index 55c1ff03e314c6feb0a5ce623bf45b2f7f92227d..11146fc3fd3f21f2a064dbbb365445f16d1eb7d4 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts
+++ b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts
@@ -22,48 +22,48 @@
 
                led_sys: sys {
                        label = "lr1200:blue:sys";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                sms {
                        label = "lr1200:blue:sms";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
 
                wifi {
                        label = "lr1200:blue:wifi";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                3g {
                        label = "lr1200:blue:3g";
-                       gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                4g {
                        label = "lr1200:blue:4g";
-                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                rssi1 {
                        label = "lr1200:blue:rssi1";
-                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                };
 
                rssi2 {
                        label = "lr1200:blue:rssi2";
-                       gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                rssi3 {
                        label = "lr1200:blue:rssi3";
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                rssi4 {
                        label = "lr1200:blue:rssi4";
-                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -72,16 +72,16 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
 };
 
-&gpio1 {
+&gpio {
        gpio_modem_reset {
                gpio-hog;
-               gpios = <13 GPIO_ACTIVE_HIGH>;
+               gpios = <45 GPIO_ACTIVE_HIGH>;
                output-high;
                line-name = "modem-reset";
        };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
index 9d0f6563c31d7aefb258b511334a9094988148c8..b439e635fcccf367a2ea09a2b26a64a92b053ae1 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
@@ -18,39 +18,39 @@
 
                lan {
                        label = "archer-c20-v4:green:lan";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
                        label = "archer-c20-v4:green:power";
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                wan {
                        label = "archer-c20-v4:green:wan";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
 
                wan_orange {
                        label = "archer-c20-v4:orange:wan";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wlan5g {
                        label = "archer-c20-v4:green:wlan5g";
-                       gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan2g {
                        label = "archer-c20-v4:green:wlan2g";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wps {
                        label = "archer-c20-v4:green:wps";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -59,13 +59,13 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                rfkill {
                        label = "rfkill";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RFKILL>;
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
index 9aca8429b41619cf35ae4748e2d88c4ab19b33d4..643747a3c4cef45fa351993f1f86f8dead43c067 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
@@ -19,13 +19,13 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                rfkill {
                        label = "rfkill";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RFKILL>;
                };
        };
@@ -35,39 +35,39 @@
 
                led_power: power {
                        label = "archer-c20-v5:green:power";
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
                        label = "archer-c20-v5:green:wlan2g";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan5g {
                        label = "archer-c20-v5:green:wlan5g";
-                       gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                lan {
                        label = "archer-c20-v5:green:lan";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
                wan_green {
                        label = "archer-c20-v5:green:wan";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
 
                wan_orange {
                        label = "archer-c20-v5:orange:wan";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wps {
                        label = "archer-c20-v5:green:wps";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
index 360466d56f287c88ab8f99a9c5f4263b50659cca..4bd21587f2b017c6c959d8a1dca02d4ce12e2af5 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
@@ -18,13 +18,13 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                rfkill {
                        label = "rfkill";
-                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RFKILL>;
                };
        };
@@ -34,37 +34,37 @@
 
                lan {
                        label = "archer-c50-v3:green:lan";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
                        label = "archer-c50-v3:green:power";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wan {
                        label = "archer-c50-v3:green:wan";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
 
                wan_orange {
                        label = "archer-c50-v3:orange:wan";
-                       gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
                        label = "archer-c50-v3:green:wlan2g";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
 
                wlan5 {
                        label = "archer-c50-v3:green:wlan5g";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
                wps {
                        label = "archer-c50-v3:green:wps";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
index 8db4f219877ef0b3886a26ce747ddaec57c8553c..b3c1f88ab02e489017d53a07eb2b7efef6385c22 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
@@ -19,13 +19,13 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                rfkill {
                        label = "rfkill";
-                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RFKILL>;
                };
        };
@@ -35,37 +35,37 @@
 
                led_power: power {
                        label = "archer-c50-v4:green:power";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wlan2 {
                        label = "archer-c50-v4:green:wlan2g";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
 
                wlan5 {
                        label = "archer-c50-v4:green:wlan5g";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
                lan {
                        label = "archer-c50-v4:green:lan";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
 
                wan {
                        label = "archer-c50-v4:green:wan";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
 
                wan_orange {
                        label = "archer-c50-v4:orange:wan";
-                       gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
                };
 
                wps {
                        label = "archer-c50-v4:green:wps";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts b/target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts
index 54fd805cee9dc88f00d4c4c451e6f0b3ee62bd46..b065af92df97b9e8732b15074b75ea3cc047325d 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts
@@ -19,44 +19,44 @@
 
                wps {
                        label = "re200-v2:green:wps";
-                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                wifi {
                        label = "re200-v2:green:wifi";
-                       gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                lan {
                        label = "re200-v2:green:lan";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
                        label = "re200-v2:green:power";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
 
                wifi2g_green {
                        label = "re200-v2:green:wifi2g";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wifi5g_green {
                        label = "re200-v2:green:wifi5g";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wifi2g_red {
                        label = "re200-v2:red:wifi2g";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
 
                wifi5g_red {
                        label = "re200-v2:red:wifi5g";
-                       gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi b/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi
index 45d5b8ed76b20bd893f78cd9d30b40336af010fd..a1acc556f27e6fb9bd982f8cdfad7159ee5cdaca 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi
@@ -19,13 +19,13 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
index d1adb1b38ae9ce42d846365c4b192889de510fdf..af09e52ce0ffd22608996ba16b78019b2b415125 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
@@ -27,13 +27,13 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
@@ -43,29 +43,29 @@
 
                led_power: power {
                        label = "re305-v1:blue:power";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
                        label = "re305-v1:blue:wlan2g";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan5g {
                        label = "re305-v1:blue:wlan5g";
-                       gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                rssi1 {
                        label = "re305-v1:red:rssi";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
 
                rssi2 {
                        label = "re305-v1:blue:rssi";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts
index cf0f5eb796d49c4ed125c1be941773d9295e90f0..b7c907005fd08e15ca1f8f2368894644df2fd8a5 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts
@@ -25,19 +25,19 @@
 
                wps {
                        label = "wps";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
 
                modec1 {
                        label = "sw1";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_0>;
                };
 
                modec2 {
                        label = "sw2";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_1>;
                };
        };
@@ -47,31 +47,31 @@
 
                led_power: power {
                        label = "tl-mr3020-v3:green:power";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wan {
                        label = "tl-mr3020-v3:green:3g";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ehci_port1>, <&ohci_port1>;
                        linux,default-trigger = "usbport";
                };
 
                wlan {
                        label = "tl-mr3020-v3:green:wlan";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wps {
                        label = "tl-mr3020-v3:green:wps";
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                lan {
                        label = "tl-mr3020-v3:green:lan";
-                       gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
index ad60548678bd1af3cf14e12ab6598d39879459de..bcfd449a40c7cb0634db784becea5b82f37965ac 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
@@ -18,13 +18,13 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                rfkill {
                        label = "rfkill";
-                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RFKILL>;
                };
        };
@@ -34,39 +34,39 @@
 
                lan {
                        label = "tl-mr3420-v5:green:lan";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
                        label = "tl-mr3420-v5:green:power";
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                usb {
                        label = "tl-mr3420-v5:green:usb";
-                       gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ohci_port1>, <&ehci_port1>;
                        linux,default-trigger = "usbport";
                };
 
                wan {
                        label = "tl-mr3420-v5:green:wan";
-                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                wan_amber {
                        label = "tl-mr3420-v5:amber:wan";
-                       gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
                        label = "tl-mr3420-v5:green:wlan";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
 
                wps {
                        label = "tl-mr3420-v5:green:wps";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
index 5485a04119f096f6e882d099919d6d2b71bd6012..175f59f2044a7e6599c184d823f8b53ccac2cb79 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
@@ -18,13 +18,13 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
@@ -34,28 +34,28 @@
 
                led_power: power {
                        label = "tl-wa801nd-v5:green:power";
-                       gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
                };
 
                lan {
                        label = "tl-wa801nd-v5:green:lan";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
                        label = "tl-wa801nd-v5:green:wlan";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wps_red {
                        label = "tl-wa801nd-v5:red:wps";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_HIGH>;
                };
 
                wps_green {
                        label = "tl-wa801nd-v5:green:wps";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
index 25444b1d3de5376207b4c3d8075c2f4d182cf6a2..2a83de7b213195f58ecb493362b04cc7f6bf3016 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
@@ -19,7 +19,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -29,7 +29,7 @@
 
                led_power: power {
                        label = "tl-wr802n-v4:green:power";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
index 5d7035bba40fac64c777083e395883e3d14149a2..7dd34c05fff7acbb5cafdbd9a9d30b5f10d76d07 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
@@ -18,7 +18,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -28,27 +28,27 @@
 
                lan {
                        label = "tl-wr840n-v4:green:lan";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
                        label = "tl-wr840n-v4:green:power";
-                       gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
                };
 
                wan {
                        label = "tl-wr840n-v4:green:wan";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
                        label = "tl-wr840n-v4:green:wlan";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
 
                wps {
                        label = "tl-wr840n-v4:green:wps";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts
index 3de58a71f6ae7f452cb18357312bb1803acad9c4..3043975d79c7f1cc986780172acf7afbd44924c0 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts
@@ -25,7 +25,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -36,12 +36,12 @@
 
                led_power_green: power {
                        label = "tl-wr840n-v5:green:power";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
 
                orange {
                        label = "tl-wr840n-v5:orange:power";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
index ca25ce643de628b4f74f89a1fbfa6b0e06b8ba53..0a141e1a2e1cff620919b8821b8418563a6d626c 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
@@ -18,13 +18,13 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                rfkill {
                        label = "rfkill";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RFKILL>;
                };
        };
@@ -34,47 +34,47 @@
 
                led_power: power {
                        label = "tl-wr841n-v13:green:power";
-                       gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
                };
 
                wps {
                        label = "tl-wr841n-v13:green:wps";
-                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
                        label = "tl-wr841n-v13:green:lan1";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
                        label = "tl-wr841n-v13:green:lan2";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
                        label = "tl-wr841n-v13:green:lan3";
-                       gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
                        label = "tl-wr841n-v13:green:lan4";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
 
                wan_green {
                        label = "tl-wr841n-v13:green:wan";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
 
                wan_orange {
                        label = "tl-wr841n-v13:orange:wan";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
                        label = "tl-wr841n-v13:green:wlan";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts
index 1654e1819fed5f385a730be3b827cf5fc010068c..74b4c4ce257cc0e62f5ec331b917d04f41255c04 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts
@@ -27,7 +27,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -37,23 +37,23 @@
 
                lan {
                        label = "tl-wr841n-v14:green:lan";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
 
                wan_green {
                        label = "tl-wr841n-v14:green:wan";
-                       gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
                };
 
                led_wlan: wlan {
                        label = "tl-wr841n-v14:green:wlan";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wan_orange {
                        label = "tl-wr841n-v14:orange:wan";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
        };
 };
@@ -122,10 +122,10 @@
        };
 };
 
-&gpio1 {
+&gpio {
        led_wlan_enable {
                gpio-hog;
-               gpios = <11 GPIO_ACTIVE_HIGH>;
+               gpios = <43 GPIO_ACTIVE_HIGH>;
                output-high;
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
index 50974fafe7fa3d1eda3a2d32a235794bafda4452..93e93dcd633c5655cd65a426a1c09b0296199d05 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
@@ -18,13 +18,13 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                rfkill {
                        label = "rfkill";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RFKILL>;
                };
        };
@@ -34,39 +34,39 @@
 
                lan {
                        label = "tl-wr842n-v5:green:lan";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
                        label = "tl-wr842n-v5:green:power";
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                usb {
                        label = "tl-wr842n-v5:green:usb";
-                       gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ohci_port1>, <&ehci_port1>;
                        linux,default-trigger = "usbport";
                };
 
                wan {
                        label = "tl-wr842n-v5:green:wan";
-                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                wan_amber {
                        label = "tl-wr842n-v5:amber:wan";
-                       gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
                        label = "tl-wr842n-v5:green:wlan";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
 
                wps {
                        label = "tl-wr842n-v5:green:wps";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
index 9d5dddbe4b8ef1dfb36ff2ea18cfc13c4e6d5f87..545fc3e054f9189836064bd7b1d7fc63c8f438ad 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
@@ -18,25 +18,25 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                sw1 {
                        label = "sw1";
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_0>;
                };
 
                sw2 {
                        label = "sw2";
-                       gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_1>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
@@ -46,34 +46,34 @@
 
                lan {
                        label = "tl-wr902ac-v3:green:lan";
-                       gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
                };
 
                led_power: power {
                        label = "tl-wr902ac-v3:green:power";
-                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                };
 
                usb {
                        label = "tl-wr902ac-v3:green:usb";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ohci_port1>, <&ehci_port1>;
                        linux,default-trigger = "usbport";
                };
 
                wan {
                        label = "tl-wr902ac-v3:green:wan";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
                        label = "tl-wr902ac-v3:green:wlan";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
 
                wps {
                        label = "tl-wr902ac-v3:green:wps";
-                       gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi
index afa7f18efc740fcd49c60355347a6741e0b0c329..41bbf0ee9316006eb795951024297ade19d26636 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi
+++ b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi
@@ -56,7 +56,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -66,56 +66,48 @@
 
                led_power: power {
                        label = "u7628-01:green:power";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
                        label = "u7628-01:green:wlan";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wan {
                        label = "u7628-01:green:wan";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
                        label = "u7628-01:green:lan1";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
                        label = "u7628-01:green:lan2";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
                        label = "u7628-01:green:lan3";
-                       gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
                        label = "u7628-01:green:lan4";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
 
                usb {
                        label = "u7628-01:green:usb";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ohci_port1>, <&ehci_port1>;
                        linux,default-trigger = "usbport";
                };
        };
 };
 
-&gpio0 {
-       status = "okay";
-};
-
-&gpio1 {
-       status = "okay";
-};
-
 &pcie {
        status = "okay";
 };

diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts b/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts
index 12e45be5744d8e264263fe02f6f8add4bda76a71..421c8becc01ac26f3a68a3292ad4d19b54dd9f60 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts
+++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts
@@ -18,7 +18,7 @@
 
                led_status: status {
                        label = "vocore2lite:green:status";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_HIGH>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts
index 2630f5261ea0faf3f205130b716f3b71869a06f4..a275d8835e67c7c2435248172359cf1b93ebff5c 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts
+++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts
@@ -18,7 +18,7 @@
 
                led_status: status {
                        label = "vocore2:fuchsia:status";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_HIGH>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts
index a38907400cc6f8a1c7858eb57698c706eded17b7..017252f6a30af28a0ddd8e7d68cfeb817ed03cd0 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts
+++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts
@@ -17,7 +17,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -27,33 +27,33 @@
 
                power {
                        label = "wl-wn570ha1:green:power";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                wan {
                        label = "wl-wn570ha1:green:wan";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
 
                wifi-high {
                        label = "wl-wn570ha1:green:wifi-high";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wifi-med {
                        label = "wl-wn570ha1:green:wifi-med";
-                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                wifi-low {
                        label = "wl-wn570ha1:green:wifi-low";
-                       gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                wifi {
                        label = "wl-wn570ha1:green:wifi";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts
index 330ae58074b3abeee92f7b9a40692902cdab08e0..4f4087eefc3a83b2a1be0e0d19bf69abeb071572 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts
+++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts
@@ -17,13 +17,13 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
@@ -33,22 +33,22 @@
 
                wifi-high {
                        label = "wl-wn575a3:green:wifi-high";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
 
                wifi-med {
                        label = "wl-wn575a3:green:wifi-med";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wifi-low {
                        label = "wl-wn575a3:green:wifi-low";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
 
                wps {
                        label = "wl-wn575a3:green:wps";
-                       gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi
index f89342eb8f06ca56a3fe9a7a83c4d40d9074f74f..581a99eef563353d66ca240eb7dc00cfa8229895 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi
+++ b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi
@@ -32,7 +32,7 @@
 
                wps {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
index c3a37fad4773a12dbe87e5aee44352fd15e8e38b..bcea56517be4293dc2e962741bd1fc9d764d6aff 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
+++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
@@ -28,22 +28,22 @@
 
                led_run: run {
                        label = "wizfi630s:green:run";
-                       gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                ledwps {
                        label = "wizfi630s:green:wps";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
                leduart1 {
                        label = "wizfi630s:green:uart1";
-                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                leduart2 {
                        label = "wizfi630s:green:uart2";
-                       gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -55,25 +55,25 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
 
                scm1 {
                        label = "SCM1";
-                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_1>;
                };
 
                scm2 {
                        label = "SCM2";
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_2>;
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi
index 89b37f6b37d711a5e3a57a117622c36c34ce298e..882a8838dd7560320315705ba97109785602a780 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi
+++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi
@@ -15,7 +15,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts
index 6ac44ec8eafa1764da5f2efdffa88d4a22923f5b..8a8ab94a4ec42f82f833bff9deeabae6e3f3f869 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts
+++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts
@@ -18,7 +18,7 @@
 
                led_indicator: indicator {
                        label = "wrtnode:blue:indicator";
-                       gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts
index afd0c93595dd27c3e51988e146cfe486c978c22f..32b5f53d2a9d6e30be366a53dadc215e761c3bcd 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts
+++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts
@@ -21,7 +21,7 @@
 
                led_indicator: indicator {
                        label = "wrtnode:blue:indicator";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts
index fcbacf6db80d3571082fc2e795630c432f5367c5..cb91e15aa981f312196037f464275f60f846a247 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts
@@ -26,12 +26,12 @@
 
                power_blue: power_blue {
                        label = "mir4a-100m:blue:power";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                power_yellow: power_yellow {
                        label = "mir4a-100m:yellow:power";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -40,7 +40,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts
index e502f273afbb5a1ddafa9ae06fc61732fa3d256d..b565b106f3a0ee62174bf9b818dab4b81828740e 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts
@@ -26,17 +26,17 @@
 
                led_status_blue: status_blue {
                        label = "miwifi-nano:blue:status";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                led_status_red: status_red {
                        label = "miwifi-nano:red:status";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
 
                led_status_amber: status_amber {
                        label = "miwifi-nano:amber:status";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -45,7 +45,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };

diff --git a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts
index fb620eae3ea174e64a3cf58e383b39ed1485145c..231780a252a6bc75c4be76bfb137e74f5469b4a9 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts
+++ b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts
@@ -24,7 +24,7 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -34,22 +34,22 @@
 
                wan {
                        label = "zbt-we1226:green:wan";
-                       gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
                        label = "zbt-we1226:green:lan1";
-                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
                        label = "zbt-we1226:green:lan2";
-                       gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                };
 
                led_wlan: wlan {
                        label = "zbt-we1226:green:wlan";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts
index 0fd8c56d03d62e6dfb31c7f3bc2e617bf5295a6b..bc1000b7dcfdce60350abf5c19a30267aaa50e34 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts
+++ b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts
@@ -25,19 +25,19 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
 
                fn {
                        label = "fn";
-                       gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 45 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_0>;
                };
        };
@@ -47,23 +47,23 @@
 
                led_power: power {
                        label = "keenetic-extra-ii:green:power";
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                internet {
                        label = "keenetic-extra-ii:green:internet";
-                       gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
 
                wifi {
                        label = "keenetic-extra-ii:green:wifi";
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
 
                usb {
                        label = "keenetic-extra-ii:green:usb";
-                       gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ohci_port1>, <&ehci_port1>;
                        linux,default-trigger = "usbport";
                };
@@ -76,7 +76,7 @@
                usbpower {
                        gpio-export,name = "usbpower";
                        gpio-export,output = <1>;
-                       gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio 6 GPIO_ACTIVE_HIGH>;
                };
        };
 };