ramips: simplify state_default/pinctrl0 in device DTS files

The node pinctrl0 is already set up in the SOC DTSI files, but
defined again as member of pinctrl in most of the device DTS(I)
files. This patch removes this redundancy for the entire ramips
target.

Signed-off-by: Adrian Schmutzler <[email protected]>

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

@@ -97,12 +97,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -123,12 +123,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "nd_sd", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "nd_sd", "spi refclk", "wled";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -154,12 +154,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "ephy", "pcie", "rgmii1", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "ephy", "pcie", "rgmii1", "wled";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -131,12 +131,10 @@
 	status = "disabled";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "ephy", "nd_sd", "pcie", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "ephy", "nd_sd", "pcie", "uartf";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -148,12 +148,10 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "mdio", "rgmii1";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "mdio", "rgmii1";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -125,12 +125,10 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "wled", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "wled", "uartf";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -142,11 +142,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "spi refclk", "uartf", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "spi refclk", "uartf", "wled";
+		ralink,function = "gpio";
 	};
 };

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

@@ -130,12 +130,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "wled", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "wled", "nd_sd";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -130,12 +130,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -130,12 +130,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -161,17 +161,15 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "rgmii1";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "rgmii1";
+		ralink,function = "gpio";
+	};
 
-		gpio_i2s {
-			ralink,group = "uartf";
-			ralink,function = "gpio i2s";
-		};
+	gpio_i2s {
+		ralink,group = "uartf";
+		ralink,function = "gpio i2s";
 	};
 };
 

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

@@ -129,11 +129,9 @@
 	mediatek,port4 = "ephy";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf";
+		ralink,function = "gpio";
 	};
 };

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

@@ -117,12 +117,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "mdio", "rgmii1", "i2c", "wled", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "mdio", "rgmii1", "i2c", "wled", "uartf";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -129,12 +129,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "uartf", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "ephy", "uartf", "spi refclk", "wled";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -127,12 +127,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "uartf", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "ephy", "uartf", "spi refclk", "wled";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -152,12 +152,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uartf", "nd_sd", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uartf", "nd_sd", "wled";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -130,12 +130,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "nd_sd";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -115,12 +115,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "nd_sd";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -98,14 +98,14 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "nd_sd", "rgmii2";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "nd_sd", "rgmii2";
+		ralink,function = "gpio";
 	};
+};
 
+&pinctrl {
 	phy_reset_pins: phy-reset {
 		gpio {
 			ralink,group = "spi refclk";
@@ -115,8 +115,8 @@
 };
 
 &ethernet {
-
 	status = "okay";
+
 	mtd-mac-address = <&factory 0x4>;
 
 	pinctrl-names = "default";

target/linux/ramips/dts/mt7620a_engenius_esr600.dts

@@ -165,15 +165,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group =	"i2c",	/* gpio0: 1-2 */
-				"uartf",	/* gpio0: 7-14 */
-				"nd_sd",	/* gpio2: 45-59 */
-				"wled";		/* gpio3: 72 */
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "nd_sd", "wled";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -145,11 +145,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wled","ephy","uartf","i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wled","ephy","uartf","i2c";
+		ralink,function = "gpio";
 	};
 };

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

@@ -136,11 +136,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wled","ephy","i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wled","ephy","i2c";
+		ralink,function = "gpio";
 	};
 };

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

@@ -151,11 +151,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wled","ephy","uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wled","ephy","uartf";
+		ralink,function = "gpio";
 	};
 };

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

@@ -159,13 +159,11 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf", "pa", "spi refclk",
-				       "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf", "pa", "spi refclk",
+			       "wled";
+		ralink,function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi

@@ -125,11 +125,9 @@
 	pinctrl-0 = <&pa_pins>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uartf", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uartf", "wled";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_hnet_c108.dts

@@ -172,12 +172,10 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf", "spi refclk", "ephy";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf", "spi refclk", "ephy";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -184,12 +184,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -165,12 +165,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "mdio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "mdio";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -105,11 +105,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "uartf", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "uartf", "ephy", "wled";
+		ralink,function = "gpio";
 	};
 };

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

@@ -170,11 +170,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uartf", "i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uartf", "i2c";
+		ralink,function = "gpio";
 	};
 };

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

@@ -99,11 +99,9 @@
 	pinctrl-0 = <&pa_pins>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uartf", "wled", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uartf", "wled", "nd_sd";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_linksys_e1700.dts

@@ -97,12 +97,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf";
+		ralink,function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_microduino_microwrt.dts

@@ -97,11 +97,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "wled", "i2c", "wdt", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "wled", "i2c", "wdt", "uartf";
+		ralink,function = "gpio";
 	};
 };

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

@@ -54,11 +54,9 @@
 	mtd-mac-address = <&art 0x6>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf", "spi refclk";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf", "spi refclk";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_netgear_ex3700_ex6130.dtsi

@@ -105,11 +105,9 @@
 	ralink,mtd-eeprom = <&factory 0x0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "rgmii2", "spi refclk";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "rgmii2", "spi refclk";
+		ralink,function = "gpio";
 	};
 };

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

@@ -93,12 +93,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled";
+		ralink,function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_phicomm_k2g.dts

@@ -93,12 +93,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf";
+		ralink,function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts

@@ -89,12 +89,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "spi refclk", "wled";
+		ralink,function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts

@@ -34,12 +34,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
+		ralink,function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts

@@ -34,12 +34,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "pa";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "pa";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -116,16 +116,14 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi refclk", "rgmii1";
-			ralink,function = "gpio";
-		};
-		wdt {
-			ralink,group = "wdt";
-			ralink,function = "wdt refclk";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi refclk", "rgmii1";
+		ralink,function = "gpio";
+	};
+	wdt {
+		ralink,group = "wdt";
+		ralink,function = "wdt refclk";
 	};
 };
 

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

@@ -80,12 +80,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi refclk", "rgmii1";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "spi refclk", "rgmii1";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -100,12 +100,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi refclk", "rgmii1", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "spi refclk", "rgmii1", "nd_sd";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -120,12 +120,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "spi refclk", "rgmii1", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "spi refclk", "rgmii1", "wled";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -125,12 +125,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uartf", "nd_sd", "rgmii2", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uartf", "nd_sd", "rgmii2", "wled";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -66,12 +66,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -47,12 +47,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -60,12 +60,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "spi";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "spi";
+		ralink,function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_sanlinking_d240.dts

@@ -177,26 +177,24 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa";
+		ralink,function = "gpio";
+	};
 
-		/*
-		 * The sd function of the nd_sd group configures two of the
-		 * groups pins as gpios. The pins are used as PCIe reset/power.
-		 * Due to the driver load order, the pins are configured way to
-		 * late if triggered by the sd-card driver.
-		 * To not introduce another kind of driver load order
-		 * dependency and configure the pins as early as possible,
-		 * means during pinmux driver load.
-		 */
-		gpio_sd {
-			ralink,group = "nd_sd";
-			ralink,function = "sd";
-		};
+	/*
+	 * The sd function of the nd_sd group configures two of the
+	 * groups pins as gpios. The pins are used as PCIe reset/power.
+	 * Due to the driver load order, the pins are configured way to
+	 * late if triggered by the sd-card driver.
+	 * To not introduce another kind of driver load order
+	 * dependency and configure the pins as early as possible,
+	 * means during pinmux driver load.
+	 */
+	gpio_sd {
+		ralink,group = "nd_sd";
+		ralink,function = "sd";
 	};
 };
 

target/linux/ramips/dts/mt7620a_sercomm_na930.dts

@@ -114,17 +114,15 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "rgmii2", "spi", "ephy";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "rgmii2", "spi", "ephy";
+		ralink,function = "gpio";
+	};
 
-		uartf_gpio {
-			ralink,group = "uartf";
-			ralink,function = "gpio uartf";
-		};
+	uartf_gpio {
+		ralink,group = "uartf";
+		ralink,function = "gpio uartf";
 	};
 };
 

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

@@ -20,15 +20,6 @@
 		bootargs = "console=ttyS0,115200";
 	};
 
-	pinctrl {
-		state_default: pinctrl0 {
-			gpio {
-				ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk";
-				ralink,function = "gpio";
-			};
-		};
-	};
-
 	leds {
 		compatible = "gpio-leds";
 
@@ -165,6 +156,13 @@
 	status = "okay";
 };
 
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk";
+		ralink,function = "gpio";
+	};
+};
+
 &wmac {
 	ralink,mtd-eeprom = <&radio 0>;
 	mtd-mac-address = <&rom 0xf100>;

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

@@ -61,12 +61,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "wled", "ephy", "spi refclk", "wdt";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -42,11 +42,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk";
+		ralink,function = "gpio";
 	};
 };

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

@@ -61,12 +61,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "ephy", "spi refclk", "mdio", "wdt", "nd_sd";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "ephy", "spi refclk", "mdio", "wdt", "nd_sd";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -160,12 +160,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd", "ephy", "spi refclk";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -152,11 +152,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "rgmii1";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "rgmii1";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620a_youku_yk1.dts

@@ -110,12 +110,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "rgmii1", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "rgmii1", "ephy", "wled";
+		ralink,function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_yukai_bocco.dts

@@ -139,12 +139,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "spi refclk", "rgmii1";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "spi refclk", "rgmii1";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -133,11 +133,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wled", "i2c", "uartf", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wled", "i2c", "uartf", "wdt";
+		ralink,function = "gpio";
 	};
 };

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

@@ -94,11 +94,9 @@
 	ralink,mtd-eeprom = <&factory 0x0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf", "spi refclk", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf", "spi refclk", "ephy", "wled";
+		ralink,function = "gpio";
 	};
 };

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

@@ -74,11 +74,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf", "wled";
+		ralink,function = "gpio";
 	};
 };

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

@@ -82,12 +82,10 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa";
+		ralink,function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7620a_zte_q7.dts

@@ -89,12 +89,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -128,12 +128,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uartf";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -116,11 +116,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "wled", "i2c", "wdt", "pa", "spi refclk";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "ephy", "wled", "i2c", "wdt", "pa", "spi refclk";
+		ralink,function = "gpio";
 	};
 };

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

@@ -129,11 +129,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "wled", "i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "ephy", "wled", "i2c";
+		ralink,function = "gpio";
 	};
 };

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

@@ -105,11 +105,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "ephy";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "ephy";
+		ralink,function = "gpio";
 	};
 };

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

@@ -114,11 +114,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "wled", "spi refclk", "i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "ephy", "wled", "spi refclk", "i2c";
+		ralink,function = "gpio";
 	};
 };

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

@@ -97,12 +97,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "wled";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -141,11 +141,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "spi refclk", "i2c", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "spi refclk", "i2c", "ephy", "wled";
+		ralink,function = "gpio";
 	};
 };

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

@@ -143,11 +143,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "spi refclk", "i2c", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "spi refclk", "i2c", "ephy", "wled";
+		ralink,function = "gpio";
 	};
 };

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

@@ -126,11 +126,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "ephy", "wled";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_kimax_u35wf.dts

@@ -105,11 +105,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "ephy", "wled";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_kingston_mlw221.dts

@@ -121,11 +121,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "ephy", "wled";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts

@@ -121,11 +121,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "ephy", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "ephy", "wled";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi

@@ -51,11 +51,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_ravpower_wd03.dts

@@ -107,11 +107,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wled", "ephy";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wled", "ephy";
+		ralink,function = "gpio";
 	};
 };

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

@@ -89,11 +89,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts

@@ -94,11 +94,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf", "spi refclk";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf", "spi refclk";
+		ralink,function = "gpio";
 	};
 };

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

@@ -117,11 +117,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "spi refclk", "wled";
+		ralink,function = "gpio";
 	};
 };

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

@@ -121,11 +121,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "spi refclk", "wled";
+		ralink,function = "gpio";
 	};
 };

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

@@ -102,11 +102,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "spi refclk", "wled";
+		ralink,function = "gpio";
 	};
 };

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

@@ -115,11 +115,9 @@
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		default {
-			ralink,group = "i2c", "uartf", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	default {
+		ralink,group = "i2c", "uartf", "spi refclk", "wled";
+		ralink,function = "gpio";
 	};
 };

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

@@ -124,12 +124,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled";
+		ralink,function = "gpio";
 	};
 };
 

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

@@ -124,12 +124,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled";
+		ralink,function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7621_adslr_g7.dts

@@ -109,11 +109,9 @@
 	mtd-mac-address = <&factory 0xe00c>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "wdt";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7621_afoundry_ew1200.dts

@@ -121,11 +121,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "rgmii2", "jtag", "mdio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "rgmii2", "jtag", "mdio";
+		ralink,function = "gpio";
 	};
 };

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

@@ -165,12 +165,10 @@
 	status = "okay";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "rgmii2", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "rgmii2", "wdt";
+		ralink,function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi

@@ -108,11 +108,9 @@
 	mediatek,portmap = "llllw";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "jtag";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "jtag";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts

@@ -138,11 +138,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "sdhci";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "sdhci";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi

@@ -147,11 +147,9 @@
 	status = "disabled";
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart2", "uart3", "i2c";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart2", "uart3", "i2c";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts

@@ -158,12 +158,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		ralink,function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts

@@ -153,12 +153,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		ralink,function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts

@@ -153,11 +153,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "jtag", "uart2", "uart3";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "jtag", "uart2", "uart3";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts

@@ -168,11 +168,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "rgmii2", "jtag", "mdio";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "rgmii2", "jtag", "mdio";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts

@@ -134,11 +134,9 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts

@@ -128,12 +128,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "i2c", "uart3", "jtag", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "i2c", "uart3", "jtag", "wdt";
+		ralink,function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7621_elecom_wrc-gst.dtsi

@@ -154,12 +154,10 @@
 	};
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "uart3", "jtag", "wdt", "sdhci";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "uart3", "jtag", "wdt", "sdhci";
+		ralink,function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7621_firefly_firewrt.dts

@@ -114,11 +114,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "wdt", "rgmii2";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "wdt", "rgmii2";
+		ralink,function = "gpio";
 	};
 };

target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts

@@ -114,11 +114,9 @@
 	mtd-mac-address = <&factory 0xe000>;
 };
 
-&pinctrl {
-	state_default: pinctrl0 {
-		gpio {
-			ralink,group = "jtag", "wdt";
-			ralink,function = "gpio";
-		};
+&state_default {
+	gpio {
+		ralink,group = "jtag", "wdt";
+		ralink,function = "gpio";
 	};
 };