ramips: add basic support for kernel 5.4

target/linux/ramips/dts/mt7620a.dtsi

@@ -116,7 +116,7 @@
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <0>;
-			ralink,nr-gpio = <24>;
+			ralink,num-gpios = <24>;
 			ralink,register-map = [ 00 04 08 0c
 						20 24 28 2c
 						30 34 ];
@@ -133,7 +133,7 @@
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <24>;
-			ralink,nr-gpio = <16>;
+			ralink,num-gpios = <16>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
 						20 24 ];
@@ -152,7 +152,7 @@
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <40>;
-			ralink,nr-gpio = <32>;
+			ralink,num-gpios = <32>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
 						20 24 ];
@@ -171,7 +171,7 @@
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <72>;
-			ralink,nr-gpio = <1>;
+			ralink,num-gpios = <1>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
 						20 24 ];
@@ -315,113 +315,113 @@
 
 		pcm_i2s_pins: pcm_i2s {
 			pcm_i2s {
-				ralink,group = "uartf";
-				ralink,function = "pcm i2s";
+				groups = "uartf";
+				function = "pcm i2s";
 			};
 		};
 
 		uartf_gpio_pins: uartf_gpio {
 			uartf_gpio {
-				ralink,group = "uartf";
-				ralink,function = "gpio uartf";
+				groups = "uartf";
+				function = "gpio uartf";
 			};
 		};
 
 		gpio_i2s_pins: gpio_i2s {
 			gpio_i2s {
-				ralink,group = "uartf";
-				ralink,function = "gpio i2s";
+				groups = "uartf";
+				function = "gpio i2s";
 			};
 		};
 
 		spi_pins: spi_pins {
 			spi_pins {
-				ralink,group = "spi";
-				ralink,function = "spi";
+				groups = "spi";
+				function = "spi";
 			};
 		};
 
 		spi_cs1: spi1 {
 			spi1 {
-				ralink,group = "spi refclk";
-				ralink,function = "spi refclk";
+				groups = "spi refclk";
+				function = "spi refclk";
 			};
 		};
 
 		i2c_pins: i2c_pins {
 			i2c_pins {
-				ralink,group = "i2c";
-				ralink,function = "i2c";
+				groups = "i2c";
+				function = "i2c";
 			};
 		};
 
 		uartlite_pins: uartlite {
 			uart {
-				ralink,group = "uartlite";
-				ralink,function = "uartlite";
+				groups = "uartlite";
+				function = "uartlite";
 			};
 		};
 
 		mdio_pins: mdio {
 			mdio {
-				ralink,group = "mdio";
-				ralink,function = "mdio";
+				groups = "mdio";
+				function = "mdio";
 			};
 		};
 
 		mdio_refclk_pins: mdio_refclk {
 			mdio_refclk {
-				ralink,group = "mdio";
-				ralink,function = "refclk";
+				groups = "mdio";
+				function = "refclk";
 			};
 		};
 
 		ephy_pins: ephy {
 			ephy {
-				ralink,group = "ephy";
-				ralink,function = "ephy";
+				groups = "ephy";
+				function = "ephy";
 			};
 		};
 
 		wled_pins: wled {
 			wled {
-				ralink,group = "wled";
-				ralink,function = "wled";
+				groups = "wled";
+				function = "wled";
 			};
 		};
 
 		rgmii1_pins: rgmii1 {
 			rgmii1 {
-				ralink,group = "rgmii1";
-				ralink,function = "rgmii1";
+				groups = "rgmii1";
+				function = "rgmii1";
 			};
 		};
 
 		rgmii2_pins: rgmii2 {
 			rgmii2 {
-				ralink,group = "rgmii2";
-				ralink,function = "rgmii2";
+				groups = "rgmii2";
+				function = "rgmii2";
 			};
 		};
 
 		pcie_pins: pcie {
 			pcie {
-				ralink,group = "pcie";
-				ralink,function = "pcie rst";
+				groups = "pcie";
+				function = "pcie rst";
 			};
 		};
 
 		pa_pins: pa {
 			pa {
-				ralink,group = "pa";
-				ralink,function = "pa";
+				groups = "pa";
+				function = "pa";
 			};
 		};
 
 		sdhci_pins: sdhci {
 			sdhci {
-				ralink,group = "nd_sd";
-				ralink,function = "sd";
+				groups = "nd_sd";
+				function = "sd";
 			};
 		};
 	};

target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts

@@ -99,8 +99,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts

@@ -125,8 +125,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "nd_sd", "spi refclk", "wled";
-		ralink,function = "gpio";
+		groups = "nd_sd", "spi refclk", "wled";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts

@@ -156,8 +156,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "ephy", "pcie", "rgmii1", "wled";
-		ralink,function = "gpio";
+		groups = "ephy", "pcie", "rgmii1", "wled";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts

@@ -133,8 +133,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "ephy", "nd_sd", "pcie", "uartf";
-		ralink,function = "gpio";
+		groups = "ephy", "nd_sd", "pcie", "uartf";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_asus_rp-n53.dts

@@ -150,8 +150,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "mdio", "rgmii1";
-		ralink,function = "gpio";
+		groups = "mdio", "rgmii1";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts

@@ -127,8 +127,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "wled", "uartf";
-		ralink,function = "gpio";
+		groups = "i2c", "wled", "uartf";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts

@@ -144,7 +144,7 @@
 
 &state_default {
 	default {
-		ralink,group = "spi refclk", "uartf", "wled";
-		ralink,function = "gpio";
+		groups = "spi refclk", "uartf", "wled";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts

@@ -132,8 +132,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "wled", "nd_sd";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "wled", "nd_sd";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts

@@ -132,8 +132,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts

@@ -132,8 +132,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts

@@ -163,13 +163,13 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt", "rgmii1";
-		ralink,function = "gpio";
+		groups = "wdt", "rgmii1";
+		function = "gpio";
 	};
 
 	gpio_i2s {
-		ralink,group = "uartf";
-		ralink,function = "gpio i2s";
+		groups = "uartf";
+		function = "gpio i2s";
 	};
 };
 

target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts

@@ -131,7 +131,7 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "uartf";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts

@@ -119,8 +119,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts

@@ -131,8 +131,8 @@
 
 &state_default {
 	default {
-		ralink,group = "ephy", "uartf", "spi refclk", "wled";
-		ralink,function = "gpio";
+		groups = "ephy", "uartf", "spi refclk", "wled";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts

@@ -129,8 +129,8 @@
 
 &state_default {
 	default {
-		ralink,group = "ephy", "uartf", "spi refclk", "wled";
-		ralink,function = "gpio";
+		groups = "ephy", "uartf", "spi refclk", "wled";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts

@@ -0,0 +1,190 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "mt7620a.dtsi"
+
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+	compatible = "dlink,dwr-960", "ralink,mt7620a-soc";
+	model = "D-Link DWR-960";
+
+	aliases {
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
+	};
+
+	keys {
+		compatible = "gpio-keys";
+
+		reset {
+			label = "reset";
+			gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+
+		wps {
+			label = "wps";
+			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_status: status {
+			label = "dwr-960:green:status";
+			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+		};
+
+		wan {
+			label = "dwr-960:green:wan";
+			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+		};
+
+		lan {
+			label = "dwr-960:green:lan";
+			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+		};
+
+		sms {
+			label = "dwr-960:green:sms";
+			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+		};
+
+		signal_green {
+			label = "dwr-960:green:signal";
+			gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;
+		};
+
+		signal_red {
+			label = "dwr-960:red:signal";
+			gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
+		};
+
+		4g {
+			label = "dwr-960:green:4g";
+			gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
+		};
+
+		3g {
+			label = "dwr-960:green:3g";
+			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
+		};
+
+		wlan5g {
+			label = "dwr-960:green:wlan5g";
+			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy0tpt";
+		};
+
+		wlan2g {
+			label = "dwr-960:green:wlan2g";
+			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy1tpt";
+		};
+	};
+};
+
+&ethernet {
+	status = "okay";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&rgmii2_pins &mdio_pins>;
+	mediatek,portmap = "wllll";
+
+	port@5 {
+		status = "okay";
+		phy-mode = "rgmii-txid";
+		phy-handle = <&phy7>;
+	};
+
+	mdio-bus {
+		status = "okay";
+
+		phy7: ethernet-phy@7 {
+			reg = <7>;
+			phy-mode = "rgmii-id";
+		};
+	};
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpio3 {
+	status = "okay";
+};
+
+&spi0 {
+	status = "okay";
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <50000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "jboot";
+				reg = <0x0 0x10000>;
+				read-only;
+			};
+
+			partition@10000 {
+				compatible = "amit,jimage";
+				label = "firmware";
+				reg = <0x10000 0xfe0000>;
+			};
+
+			config: partition@ff0000 {
+				label = "config";
+				reg = <0xff0000 0x10000>;
+				read-only;
+			};
+		};
+	};
+};
+
+&ehci {
+	status = "okay";
+};
+
+&ohci {
+	status = "okay";
+};
+
+&pcie {
+	status = "okay";
+};
+
+&pcie0 {
+	wifi@0,0 {
+		compatible = "mediatek,mt76";
+		reg = <0x0000 0 0 0 0>;
+		ieee80211-freq-limit = <5000000 6000000>;
+		mediatek,mtd-eeprom = <&config 0xe08e>;
+		mtd-mac-address = <&config 0xe50e>;
+		mtd-mac-address-increment = <2>;
+	};
+};
+
+&state_default {
+	default {
+		groups = "i2c", "wled", "spi refclk", "uartf", "ephy";
+		function = "gpio";
+	};
+};

target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts

@@ -154,8 +154,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uartf", "nd_sd", "wled";
-		ralink,function = "gpio";
+		groups = "uartf", "nd_sd", "wled";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts

@@ -132,8 +132,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "nd_sd";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "nd_sd";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts

@@ -117,8 +117,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "nd_sd";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "nd_sd";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi

@@ -100,16 +100,16 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "nd_sd", "rgmii2";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "nd_sd", "rgmii2";
+		function = "gpio";
 	};
 };
 
 &pinctrl {
 	phy_reset_pins: phy-reset {
 		gpio {
-			ralink,group = "spi refclk";
-			ralink,function = "gpio";
+			groups = "spi refclk";
+			function = "gpio";
 		};
 	};
 };

target/linux/ramips/dts/mt7620a_engenius_esr600.dts

@@ -167,8 +167,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "nd_sd", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "nd_sd", "wled";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_fon_fon2601.dts

@@ -100,16 +100,16 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf";
+		function = "gpio";
 	};
 	nd_sd {
-		ralink,group = "nd_sd";
-		ralink,function = "sd";
+		groups = "nd_sd";
+		function = "sd";
 	};
 	spi_cs {
-		ralink,group = "spi refclk";
-		ralink,function = "spi refclk";
+		groups = "spi refclk";
+		function = "spi refclk";
 	};
 };
 

target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts

@@ -147,7 +147,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wled","ephy","uartf","i2c";
-		ralink,function = "gpio";
+		groups = "wled","ephy","uartf","i2c";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts

@@ -138,7 +138,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wled","ephy","i2c";
-		ralink,function = "gpio";
+		groups = "wled","ephy","i2c";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts

@@ -153,7 +153,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wled","ephy","uartf";
-		ralink,function = "gpio";
+		groups = "wled","ephy","uartf";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts

@@ -161,9 +161,9 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "uartf", "pa", "spi refclk",
+		groups = "i2c", "uartf", "pa", "spi refclk",
 			       "wled";
-		ralink,function = "gpio";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi

@@ -127,7 +127,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uartf", "wled";
-		ralink,function = "gpio";
+		groups = "uartf", "wled";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_hnet_c108.dts

@@ -174,8 +174,8 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "uartf", "spi refclk", "ephy";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "spi refclk", "ephy";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts

@@ -186,8 +186,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts

@@ -167,8 +167,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "mdio";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "mdio";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_iptime_a104ns.dts

@@ -53,7 +53,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uartf", "spi refclk";
-		ralink,function = "gpio";
+		groups = "uartf", "spi refclk";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts

@@ -107,7 +107,7 @@
 
 &state_default {
 	default {
-		ralink,group = "uartf", "ephy", "wled";
-		ralink,function = "gpio";
+		groups = "uartf", "ephy", "wled";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts

@@ -172,7 +172,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uartf", "i2c";
-		ralink,function = "gpio";
+		groups = "uartf", "i2c";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi

@@ -101,7 +101,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uartf", "wled", "nd_sd";
-		ralink,function = "gpio";
+		groups = "uartf", "wled", "nd_sd";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_linksys_e1700.dts

@@ -99,8 +99,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_microduino_microwrt.dts

@@ -99,7 +99,7 @@
 
 &state_default {
 	default {
-		ralink,group = "wled", "i2c", "wdt", "uartf";
-		ralink,function = "gpio";
+		groups = "wled", "i2c", "wdt", "uartf";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi

@@ -56,7 +56,7 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "uartf", "spi refclk";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "spi refclk";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_netgear_ex3700_ex6130.dtsi

@@ -107,7 +107,7 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "rgmii2", "spi refclk";
-		ralink,function = "gpio";
+		groups = "i2c", "rgmii2", "spi refclk";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts

@@ -95,8 +95,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_phicomm_k2g.dts

@@ -95,8 +95,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts

@@ -91,8 +91,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "spi refclk", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "spi refclk", "wled";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts

@@ -36,8 +36,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts

@@ -36,8 +36,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "pa";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "pa";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts

@@ -118,12 +118,12 @@
 
 &state_default {
 	gpio {
-		ralink,group = "spi refclk", "rgmii1";
-		ralink,function = "gpio";
+		groups = "spi refclk", "rgmii1";
+		function = "gpio";
 	};
 	wdt {
-		ralink,group = "wdt";
-		ralink,function = "wdt refclk";
+		groups = "wdt";
+		function = "wdt refclk";
 	};
 };
 

target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts

@@ -82,8 +82,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "spi refclk", "rgmii1";
-		ralink,function = "gpio";
+		groups = "i2c", "spi refclk", "rgmii1";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts

@@ -102,8 +102,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "spi refclk", "rgmii1", "nd_sd";
-		ralink,function = "gpio";
+		groups = "i2c", "spi refclk", "rgmii1", "nd_sd";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts

@@ -122,8 +122,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "spi refclk", "rgmii1", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "spi refclk", "rgmii1", "wled";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts

@@ -127,8 +127,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uartf", "nd_sd", "rgmii2", "wled";
-		ralink,function = "gpio";
+		groups = "uartf", "nd_sd", "rgmii2", "wled";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts

@@ -68,8 +68,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts

@@ -49,8 +49,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts

@@ -62,8 +62,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "spi";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "spi";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_sanlinking_d240.dts

@@ -179,8 +179,8 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "wled", "spi refclk", "pa";
+		function = "gpio";
 	};
 
 	/*
@@ -193,8 +193,8 @@
 	 * means during pinmux driver load.
 	 */
 	gpio_sd {
-		ralink,group = "nd_sd";
-		ralink,function = "sd";
+		groups = "nd_sd";
+		function = "sd";
 	};
 };
 

target/linux/ramips/dts/mt7620a_sercomm_na930.dts

@@ -116,13 +116,13 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "rgmii2", "spi", "ephy";
-		ralink,function = "gpio";
+		groups = "i2c", "rgmii2", "spi", "ephy";
+		function = "gpio";
 	};
 
 	uartf_gpio {
-		ralink,group = "uartf";
-		ralink,function = "gpio uartf";
+		groups = "uartf";
+		function = "gpio uartf";
 	};
 };
 

target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts

@@ -159,8 +159,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "wled", "ephy", "spi refclk";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts

@@ -65,8 +65,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk", "wdt";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "wled", "ephy", "spi refclk", "wdt";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts

@@ -49,8 +49,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts

@@ -65,8 +65,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "ephy", "spi refclk", "mdio", "wdt", "nd_sd";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "ephy", "spi refclk", "mdio", "wdt", "nd_sd";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts

@@ -163,8 +163,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts

@@ -53,8 +53,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "ephy", "wled", "rgmii1", "spi refclk";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "ephy", "wled", "rgmii1", "spi refclk";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_tplink_re210-v1.dts

@@ -56,8 +56,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "wled", "rgmii1";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "wled", "rgmii1";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts

@@ -154,7 +154,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "rgmii1";
-		ralink,function = "gpio";
+		groups = "i2c", "rgmii1";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_xiaomi_miwifi-r3.dts

@@ -157,13 +157,13 @@
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
-			ralink,group = "rgmii1";
-			ralink,function = "gpio";
+			groups = "rgmii1";
+			function = "gpio";
 		};
 
 		pa {
-			ralink,group = "pa";
-			ralink,function = "pa";
+			groups = "pa";
+			function = "pa";
 		};
 	};
 };

target/linux/ramips/dts/mt7620a_youku_yk1.dts

@@ -112,8 +112,8 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "rgmii1", "ephy", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "rgmii1", "ephy", "wled";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_yukai_bocco.dts

@@ -141,8 +141,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "spi refclk", "rgmii1";
-		ralink,function = "gpio";
+		groups = "spi refclk", "rgmii1";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts

@@ -135,7 +135,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wled", "i2c", "uartf", "wdt";
-		ralink,function = "gpio";
+		groups = "wled", "i2c", "uartf", "wdt";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026.dtsi

@@ -96,7 +96,7 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "uartf", "spi refclk", "ephy", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "spi refclk", "ephy", "wled";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts

@@ -76,7 +76,7 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "uartf", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "wled";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi

@@ -84,8 +84,8 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "wled", "spi refclk", "pa";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_zte_q7.dts

@@ -91,8 +91,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts

@@ -130,8 +130,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uartf";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620n.dtsi

@@ -101,7 +101,7 @@
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <0>;
-			ralink,nr-gpio = <24>;
+			ralink,num-gpios = <24>;
 			ralink,register-map = [ 00 04 08 0c
 						20 24 28 2c
 						30 34 ];
@@ -118,7 +118,7 @@
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <24>;
-			ralink,nr-gpio = <16>;
+			ralink,num-gpios = <16>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
 						20 24 ];
@@ -137,7 +137,7 @@
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <40>;
-			ralink,nr-gpio = <32>;
+			ralink,num-gpios = <32>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
 						20 24 ];
@@ -156,7 +156,7 @@
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <72>;
-			ralink,nr-gpio = <1>;
+			ralink,num-gpios = <1>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
 						20 24 ];
@@ -250,36 +250,36 @@
 
 		ephy_pins: ephy {
 			ephy {
-				ralink,group = "ephy";
-				ralink,function = "ephy";
+				groups = "ephy";
+				function = "ephy";
 			};
 		};
 
 		spi_pins: spi_pins {
 			spi_pins {
-				ralink,group = "spi";
-				ralink,function = "spi";
+				groups = "spi";
+				function = "spi";
 			};
 		};
 
 		spi_cs1: spi1 {
 			spi1 {
-				ralink,group = "spi refclk";
-				ralink,function = "spi refclk";
+				groups = "spi refclk";
+				function = "spi refclk";
 			};
 		};
 
 		i2c_pins: i2c_pins {
 			i2c_pins {
-				ralink,group = "i2c";
-				ralink,function = "i2c";
+				groups = "i2c";
+				function = "i2c";
 			};
 		};
 
 		uartlite_pins: uartlite {
 			uart {
-				ralink,group = "uartlite";
-				ralink,function = "uartlite";
+				groups = "uartlite";
+				function = "uartlite";
 			};
 		};
 	};

target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts

@@ -118,7 +118,7 @@
 
 &state_default {
 	default {
-		ralink,group = "ephy", "wled", "i2c", "wdt", "pa", "spi refclk";
-		ralink,function = "gpio";
+		groups = "ephy", "wled", "i2c", "wdt", "pa", "spi refclk";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts

@@ -131,7 +131,7 @@
 
 &state_default {
 	default {
-		ralink,group = "ephy", "wled", "i2c";
-		ralink,function = "gpio";
+		groups = "ephy", "wled", "i2c";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts

@@ -107,7 +107,7 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "ephy";
-		ralink,function = "gpio";
+		groups = "i2c", "ephy";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts

@@ -116,7 +116,7 @@
 
 &state_default {
 	default {
-		ralink,group = "ephy", "wled", "spi refclk", "i2c";
-		ralink,function = "gpio";
+		groups = "ephy", "wled", "spi refclk", "i2c";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts

@@ -99,8 +99,8 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "wled";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts

@@ -143,7 +143,7 @@
 
 &state_default {
 	default {
-		ralink,group = "spi refclk", "i2c", "ephy", "wled";
-		ralink,function = "gpio";
+		groups = "spi refclk", "i2c", "ephy", "wled";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts

@@ -145,7 +145,7 @@
 
 &state_default {
 	default {
-		ralink,group = "spi refclk", "i2c", "ephy", "wled";
-		ralink,function = "gpio";
+		groups = "spi refclk", "i2c", "ephy", "wled";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts

@@ -128,7 +128,7 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "ephy", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "ephy", "wled";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_kimax_u35wf.dts

@@ -107,7 +107,7 @@
 
 &state_default {
 	default {
-		ralink,group = "ephy", "wled";
-		ralink,function = "gpio";
+		groups = "ephy", "wled";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_kingston_mlw221.dts

@@ -123,7 +123,7 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "ephy", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "ephy", "wled";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts

@@ -123,7 +123,7 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "ephy", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "ephy", "wled";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi

@@ -53,7 +53,7 @@
 
 &state_default {
 	default {
-		ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf";
-		ralink,function = "gpio";
+		groups = "ephy", "wled", "pa", "i2c", "wdt", "uartf";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_ravpower_wd03.dts

@@ -109,7 +109,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wled", "ephy";
-		ralink,function = "gpio";
+		groups = "wled", "ephy";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts

@@ -91,7 +91,7 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c";
-		ralink,function = "gpio";
+		groups = "i2c";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts

@@ -96,7 +96,7 @@
 
 &state_default {
 	default {
-		ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf", "spi refclk";
-		ralink,function = "gpio";
+		groups = "ephy", "wled", "pa", "i2c", "wdt", "uartf", "spi refclk";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts

@@ -119,7 +119,7 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "spi refclk", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "spi refclk", "wled";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts

@@ -123,7 +123,7 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "spi refclk", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "spi refclk", "wled";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts

@@ -104,7 +104,7 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "spi refclk", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "spi refclk", "wled";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts

@@ -117,7 +117,7 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "uartf", "spi refclk", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "uartf", "spi refclk", "wled";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts

@@ -126,8 +126,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "wdt", "pa", "spi refclk", "wled";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts

@@ -126,8 +126,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled";
-		ralink,function = "gpio";
+		groups = "i2c", "wdt", "pa", "spi refclk", "wled";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7621.dtsi

@@ -1,5 +1,6 @@
 #include <dt-bindings/interrupt-controller/mips-gic.h>
 #include <dt-bindings/clock/mt7621-clk.h>
+#include <dt-bindings/gpio/gpio.h>
 
 / {
 	#address-cells = <1>;
@@ -67,36 +68,15 @@
 			reg = <0x100 0x100>;
 		};
 
-		gpio@600 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			compatible = "mtk,mt7621-gpio";
+		gpio: gpio@600 {
+			#gpio-cells = <2>;
+			#interrupt-cells = <2>;
+			compatible = "mediatek,mt7621-gpio";
+			gpio-controller;
+			interrupt-controller;
 			reg = <0x600 0x100>;
-
 			interrupt-parent = <&gic>;
 			interrupts = <GIC_SHARED 12 IRQ_TYPE_LEVEL_HIGH>;
-
-			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>;
-			};
-
-			gpio2: bank@2 {
-				reg = <2>;
-				compatible = "mtk,mt7621-gpio-bank";
-				gpio-controller;
-				#gpio-cells = <2>;
-			};
 		};
 
 		i2c: i2c@900 {
@@ -278,83 +258,83 @@
 
 		i2c_pins: i2c_pins {
 			i2c_pins {
-				ralink,group = "i2c";
-				ralink,function = "i2c";
+				groups = "i2c";
+				function = "i2c";
 			};
 		};
 
 		spi_pins: spi_pins {
 			spi_pins {
-				ralink,group = "spi";
-				ralink,function = "spi";
+				groups = "spi";
+				function = "spi";
 			};
 		};
 
 		uart1_pins: uart1 {
 			uart1 {
-				ralink,group = "uart1";
-				ralink,function = "uart1";
+				groups = "uart1";
+				function = "uart1";
 			};
 		};
 
 		uart2_pins: uart2 {
 			uart2 {
-				ralink,group = "uart2";
-				ralink,function = "uart2";
+				groups = "uart2";
+				function = "uart2";
 			};
 		};
 
 		uart3_pins: uart3 {
 			uart3 {
-				ralink,group = "uart3";
-				ralink,function = "uart3";
+				groups = "uart3";
+				function = "uart3";
 			};
 		};
 
 		rgmii1_pins: rgmii1 {
 			rgmii1 {
-				ralink,group = "rgmii1";
-				ralink,function = "rgmii1";
+				groups = "rgmii1";
+				function = "rgmii1";
 			};
 		};
 
 		rgmii2_pins: rgmii2 {
 			rgmii2 {
-				ralink,group = "rgmii2";
-				ralink,function = "rgmii2";
+				groups = "rgmii2";
+				function = "rgmii2";
 			};
 		};
 
 		mdio_pins: mdio {
 			mdio {
-				ralink,group = "mdio";
-				ralink,function = "mdio";
+				groups = "mdio";
+				function = "mdio";
 			};
 		};
 
 		pcie_pins: pcie {
 			pcie {
-				ralink,group = "pcie";
-				ralink,function = "pcie rst";
+				groups = "pcie";
+				function = "gpio";
 			};
 		};
 
 		nand_pins: nand {
 			spi-nand {
-				ralink,group = "spi";
-				ralink,function = "nand1";
+				groups = "spi";
+				function = "nand1";
 			};
 
 			sdhci-nand {
-				ralink,group = "sdhci";
-				ralink,function = "nand2";
+				groups = "sdhci";
+				function = "nand2";
 			};
 		};
 
 		sdhci_pins: sdhci {
 			sdhci {
-				ralink,group = "sdhci";
-				ralink,function = "sdhci";
+				groups = "sdhci";
+				function = "sdhci";
 			};
 		};
 	};
@@ -434,21 +414,41 @@
 		};
 	};
 
+	nficlock: nficlock {
+		#clock-cells = <0>;
+		compatible = "fixed-clock";
+
+		clock-frequency = <125000000>;
+	};
+
 	nand: nand@1e003000 {
 		status = "disabled";
 
-		compatible = "mtk,mt7621-nand";
-		bank-width = <2>;
+		compatible = "mediatek,mt7621-nfc";
 		reg = <0x1e003000 0x800
 			0x1e003800 0x800>;
+		reg-names = "nfi", "ecc";
+
+		clocks = <&nficlock>;
+		clock-names = "nfi_clk";
+	};
+
+	ethsys: syscon@1e000000 {
+		compatible = "mediatek,mt7621-ethsys",
+			     "syscon";
+		reg = <0x1e000000 0x1000>;
+		#clock-cells = <1>;
 	};
 
 	ethernet: ethernet@1e100000 {
 		compatible = "mediatek,mt7621-eth";
 		reg = <0x1e100000 0x10000>;
 
+		clocks = <&sysclock>;
+		clock-names = "ethif";
+
 		#address-cells = <1>;
-		#size-cells = <1>;
+		#size-cells = <0>;
 
 		resets = <&rstctrl 6 &rstctrl 23>;
 		reset-names = "fe", "eth";
@@ -456,26 +456,88 @@
 		interrupt-parent = <&gic>;
 		interrupts = <GIC_SHARED 3 IRQ_TYPE_LEVEL_HIGH>;
 
-		mediatek,switch = <&gsw>;
+		mediatek,ethsys = <&ethsys>;
 
-		mdio-bus {
-			#address-cells = <1>;
-			#size-cells = <0>;
+		gmac0: mac@0 {
+			compatible = "mediatek,eth-mac";
+			reg = <0>;
+			phy-mode = "rgmii";
 
-			phy1f: ethernet-phy@1f {
-				reg = <0x1f>;
-				phy-mode = "rgmii";
+			fixed-link {
+				speed = <1000>;
+				full-duplex;
+				pause;
 			};
 		};
 
-		hnat: hnat@0 {
-			compatible = "mediatek,mt7623-hnat";
-			reg = <0 0x10000>;
-			mtketh-ppd = "eth0";
-			mtketh-lan = "eth0";
-			mtketh-wan = "eth0";
-			resets = <&rstctrl 0>;
-			reset-names = "mtketh";
+		gmac1: mac@1 {
+			compatible = "mediatek,eth-mac";
+			reg = <1>;
+			status = "disabled";
+			phy-mode = "rgmii-rxid";
+		};
+
+		mdio: mdio-bus {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			switch0: switch@1f {
+				compatible = "mediatek,mt7621";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x1f>;
+				mediatek,mcm;
+				resets = <&rstctrl 2>;
+				reset-names = "mcm";
+
+				ports {
+					#address-cells = <1>;
+					#size-cells = <0>;
+					reg = <0>;
+
+					port@0 {
+						status = "disabled";
+						reg = <0>;
+						label = "lan0";
+					};
+
+					port@1 {
+						status = "disabled";
+						reg = <1>;
+						label = "lan1";
+					};
+
+					port@2 {
+						status = "disabled";
+						reg = <2>;
+						label = "lan2";
+					};
+
+					port@3 {
+						status = "disabled";
+						reg = <3>;
+						label = "lan3";
+					};
+
+					port@4 {
+						status = "disabled";
+						reg = <4>;
+						label = "lan4";
+					};
+
+					port@6 {
+						reg = <6>;
+						label = "cpu";
+						ethernet = <&gmac0>;
+						phy-mode = "rgmii";
+
+						fixed-link {
+							speed = <1000>;
+							full-duplex;
+						};
+					};
+				};
+			};
 		};
 	};
 
@@ -488,9 +550,10 @@
 
 	pcie: pcie@1e140000 {
 		compatible = "mediatek,mt7621-pci";
-		reg = <0x1e140000 0x100
-			0x1e142000 0x100>;
-
+		reg = <0x1e140000 0x100     /* host-pci bridge registers */
+			0x1e142000 0x100    /* pcie port 0 RC control registers */
+			0x1e143000 0x100    /* pcie port 1 RC control registers */
+			0x1e144000 0x100>;  /* pcie port 2 RC control registers */
 		#address-cells = <3>;
 		#size-cells = <2>;
 
@@ -505,10 +568,11 @@
 			0x01000000 0 0x00000000 0x1e160000 0 0x00010000 /* io space */
 		>;
 
-		interrupt-parent = <&gic>;
-		interrupts = <GIC_SHARED 4 IRQ_TYPE_LEVEL_HIGH
-				GIC_SHARED 24 IRQ_TYPE_LEVEL_HIGH
-				GIC_SHARED 25 IRQ_TYPE_LEVEL_HIGH>;
+		#interrupt-cells = <1>;
+		interrupt-map-mask = <0xF0000 0 0 1>;
+		interrupt-map = <0x10000 0 0 1 &gic GIC_SHARED 4 IRQ_TYPE_LEVEL_HIGH>,
+				<0x20000 0 0 1 &gic GIC_SHARED 24 IRQ_TYPE_LEVEL_HIGH>,
+				<0x30000 0 0 1 &gic GIC_SHARED 25 IRQ_TYPE_LEVEL_HIGH>;
 
 		status = "disabled";
 
@@ -516,32 +580,45 @@
 		reset-names = "pcie0", "pcie1", "pcie2";
 		clocks = <&clkctrl 24 &clkctrl 25 &clkctrl 26>;
 		clock-names = "pcie0", "pcie1", "pcie2";
+		phys = <&pcie0_phy 1>, <&pcie2_phy 0>;
+		phy-names = "pcie-phy0", "pcie-phy2";
+
+		reset-gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 
 		pcie0: pcie@0,0 {
 			reg = <0x0000 0 0 0 0>;
-
 			#address-cells = <3>;
 			#size-cells = <2>;
-
 			ranges;
+			bus-range = <0x00 0xff>;
 		};
 
 		pcie1: pcie@1,0 {
 			reg = <0x0800 0 0 0 0>;
-
 			#address-cells = <3>;
 			#size-cells = <2>;
-
 			ranges;
+			bus-range = <0x00 0xff>;
 		};
 
 		pcie2: pcie@2,0 {
 			reg = <0x1000 0 0 0 0>;
-
 			#address-cells = <3>;
 			#size-cells = <2>;
-
 			ranges;
+			bus-range = <0x00 0xff>;
 		};
 	};
+
+	pcie0_phy: pcie-phy@1e149000 {
+		compatible = "mediatek,mt7621-pci-phy";
+		reg = <0x1e149000 0x0700>;
+		#phy-cells = <1>;
+	};
+
+	pcie2_phy: pcie-phy@1e14a000 {
+		compatible = "mediatek,mt7621-pci-phy";
+		reg = <0x1e14a000 0x0700>;
+		#phy-cells = <1>;
+	};
 };

target/linux/ramips/dts/mt7621_adslr_g7.dts

@@ -15,7 +15,7 @@
 		led-failsafe = &led_sys;
 		led-running = &led_sys;
 		led-upgrade = &led_sys;
-		label-mac-device = &ethernet;
+		label-mac-device = &gmac0;
 	};
 
 	chosen {
@@ -27,7 +27,7 @@
 
 		led_sys: sys {
 			label = "g7:blue:sys";
-			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 	};
 
@@ -36,7 +36,7 @@
 
 		reset {
 			label = "reset";
-			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 			debounce-interval = <60>;
 			linux,code = <KEY_RESTART>;
 		};
@@ -105,13 +105,44 @@
 	};
 };
 
-&ethernet {
+&gmac0 {
 	mtd-mac-address = <&factory 0xe00c>;
 };
 
+&switch0 {
+	ports {
+		port@0 {
+			status = "okay";
+			label = "lan1";
+		};
+
+		port@1 {
+			status = "okay";
+			label = "lan2";
+		};
+
+		port@2 {
+			status = "okay";
+			label = "lan3";
+		};
+
+		port@3 {
+			status = "okay";
+			label = "lan4";
+		};
+
+		port@4 {
+			status = "okay";
+			label = "wan";
+			mtd-mac-address = <&factory 0xe00c>;
+			mtd-mac-address-increment = <1>;
+		};
+	};
+};
+
 &state_default {
 	gpio {
-		ralink,group = "i2c", "wdt";
-		ralink,function = "gpio";
+		groups = "i2c", "uart3", "wdt";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7621_afoundry_ew1200.dts

@@ -20,18 +20,12 @@
 		bootargs = "console=ttyS0,57600";
 	};
 
-	palmbus: palmbus@1E000000 {
-		i2c@900 {
-			status = "okay";
-		};
-	};
-
 	keys {
 		compatible = "gpio-keys";
 
 		reset {
 			label = "reset";
-			gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_RESTART>;
 		};
 	};
@@ -41,12 +35,12 @@
 
 		led_run: run {
 			label = "ew1200:green:run";
-			gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb {
 			label = "ew1200:green:usb";
-			gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
 			linux,default-trigger = "usbport";
 		};
@@ -117,13 +111,44 @@
 	};
 };
 
-&ethernet {
+&gmac0 {
 	mtd-mac-address = <&factory 0xe000>;
 };
 
+&switch0 {
+	ports {
+		port@0 {
+			status = "okay";
+			label = "lan1";
+		};
+
+		port@1 {
+			status = "okay";
+			label = "lan2";
+		};
+
+		port@2 {
+			status = "okay";
+			label = "lan3";
+		};
+
+		port@3 {
+			status = "okay";
+			label = "lan4";
+		};
+
+		port@4 {
+			status = "okay";
+			label = "wan";
+			mtd-mac-address = <&factory 0xe000>;
+			mtd-mac-address-increment = <1>;
+		};
+	};
+};
+
 &state_default {
 	gpio {
-		ralink,group = "wdt", "rgmii2", "jtag", "mdio";
-		ralink,function = "gpio";
+		groups = "i2c", "uart3", "wdt";
+		function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts

@@ -11,7 +11,7 @@
 	model = "ALFA Network Quad-E4G";
 
 	aliases {
-		label-mac-device = &ethernet;
+		label-mac-device = &gmac0;
 		led-boot = &led_system;
 		led-failsafe = &led_system;
 		led-running = &led_system;
@@ -29,61 +29,61 @@
 		m2-enable {
 			gpio-export,name = "m2-enable";
 			gpio-export,output = <1>;
-			gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
 		};
 
 		minipcie0-enable {
 			gpio-export,name = "minipcie0-enable";
 			gpio-export,output = <1>;
-			gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
 		};
 
 		minipcie0-reset {
 			gpio-export,name = "minipcie0-reset";
 			gpio-export,output = <0>;
-			gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
 		};
 
 		minipcie1-enable {
 			gpio-export,name = "minipcie1-enable";
 			gpio-export,output = <1>;
-			gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio 30 GPIO_ACTIVE_HIGH>;
 		};
 
 		minipcie1-reset {
 			gpio-export,name = "minipcie1-reset";
 			gpio-export,output = <0>;
-			gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
 		};
 
 		minipcie2-enable {
 			gpio-export,name = "minipcie2-enable";
 			gpio-export,output = <1>;
-			gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 		};
 
 		minipcie2-reset {
 			gpio-export,name = "minipcie2-reset";
 			gpio-export,output = <0>;
-			gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
 		};
 
 		pcie-perst-disable {
 			gpio-export,name = "pcie-perst-enable";
 			gpio-export,output = <0>;
-			gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
 		};
 
 		sim-select {
 			gpio-export,name = "sim-select";
 			gpio-export,output = <1>;
-			gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 		};
 
 		watchdog-enable {
 			gpio-export,name = "watchdog-enable";
 			gpio-export,output = <1>;
-			gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -92,19 +92,19 @@
 
 		reset {
 			label = "reset";
-			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_RESTART>;
 		};
 
 		user1 {
 			label = "user1";
-			gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 			linux,code = <BTN_0>;
 		};
 
 		user2 {
 			label = "user2";
-			gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 			linux,code = <BTN_1>;
 		};
 	};
@@ -114,44 +114,74 @@
 
 		led_system: system {
 			label = "quad-e4g:red:system";
-			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		m2 {
 			label = "quad-e4g:orange:m2";
-			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
 		};
 
 		minipcie0 {
 			label = "quad-e4g:orange:minipcie0";
-			gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
 		};
 
 		minipcie1 {
 			label = "quad-e4g:orange:minipcie1";
-			gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
 		};
 
 		minipcie2 {
 			label = "quad-e4g:orange:minipcie2";
-			gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 		};
 	};
 
 	watchdog {
 		compatible = "linux,wdt-gpio";
-		gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>;
+		gpios = <&gpio 18 GPIO_ACTIVE_HIGH>;
 		hw_algo = "toggle";
 		hw_margin_ms = <25000>;
 		always-running;
 	};
 };
 
-&ethernet {
+&gmac0 {
 	mtd-mac-address = <&factory 0xe000>;
 };
 
+&switch0 {
+	ports {
+		port@0 {
+			status = "okay";
+			label = "lan4";
+		};
+
+		port@1 {
+			status = "okay";
+			label = "lan3";
+		};
+
+		port@2 {
+			status = "okay";
+			label = "lan2";
+		};
+
+		port@3 {
+			status = "okay";
+			label = "lan1";
+		};
+
+		port@4 {
+			status = "okay";
+			label = "wan";
+			mtd-mac-address = <&factory 0xe006>;
+		};
+	};
+};
+
 &i2c {
 	status = "okay";
 
@@ -167,8 +197,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "jtag", "rgmii2", "wdt";
-		ralink,function = "gpio";
+		groups = "jtag", "rgmii2", "wdt";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7621_asiarf_ap7621-001.dts

@@ -7,3 +7,19 @@
 	compatible = "asiarf,ap7621-001", "mediatek,mt7621-soc";
 	model = "AsiaRF AP7621-001";
 };
+
+&switch0 {
+	ports {
+		port@0 {
+			status = "okay";
+			label = "lan";
+		};
+
+		port@4 {
+			status = "okay";
+			label = "wan";
+			mtd-mac-address = <&factory 0xe000>;
+			mtd-mac-address-increment = <1>;
+		};
+	};
+};

target/linux/ramips/dts/mt7621_asiarf_ap7621-nv1.dts

@@ -7,3 +7,24 @@
 	compatible = "asiarf,ap7621-nv1", "mediatek,mt7621-soc";
 	model = "AsiaRF AP7621-NV1";
 };
+
+&switch0 {
+	ports {
+		port@0 {
+			status = "okay";
+			label = "wan";
+			mtd-mac-address = <&factory 0xe000>;
+			mtd-mac-address-increment = <1>;
+		};
+
+		port@2 {
+			status = "okay";
+			label = "lan1";
+		};
+
+		port@3 {
+			status = "okay";
+			label = "lan2";
+		};
+	};
+};

target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi

@@ -15,7 +15,7 @@
 
 		reset {
 			label = "reset";
-			gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_RESTART>;
 		};
 	};
@@ -25,12 +25,12 @@
 
 		wlan1 {
 			label = "ap7621-001:orange:wlan1";
-			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan0 {
 			label = "ap7621-001:orange:wlan0";
-			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
@@ -103,14 +103,13 @@
 	status = "okay";
 };
 
-&ethernet {
+&gmac0 {
 	mtd-mac-address = <&factory 0xe000>;
-	mediatek,portmap = "llllw";
 };
 
 &state_default {
 	gpio {
-		ralink,group = "wdt", "jtag";
-		ralink,function = "gpio";
+		groups = "wdt", "jtag";
+		function = "gpio";
 	};
 };