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 <[email protected]>

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 {

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";
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};

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";
 

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>;
 		};
 	};
 };

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>;
 		};
 	};

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>;
 		};
 	};
 };

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";
 		};
 	};

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>;
 		};
 	};
 };

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";
 		};
 	};

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>;
 		};
 	};

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>;
 		};

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";
 		};
 	};

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";
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};
 };

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;

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";
 

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>;
 		};
 	};
 };

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>;
 		};
 	};

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>;
 		};
 	};

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";
 		};
 	};

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";
 	};

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>;
 		};
 	};

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };

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;
 	};
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };

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";
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};
 };

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>;
 		};
 	};
 };