ramips: replace pinctrl property names

Upstream pinctrl driver in drivers/staging uses
groups/function/ralink,num-gpios instead of
ralink,group/ralink,function/ralink,nr-gpio
Replace these properties in dts as well as the pinctrl driver in
patches-4.14.
This commit is created using:
sed -i 's/ralink,group/groups/g'
sed -i 's/ralink,function/function/g'
sed -i 's/ralink,nr-gpio/ralink,num-gpios/g'

Signed-off-by: Chuanhong Guo <[email protected]>

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

@@ -184,7 +184,7 @@
 
 &state_default {
 	default {
-		ralink,group = "i2c", "wled", "spi refclk", "uartf", "ephy";
-		ralink,function = "gpio";
+		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_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/mt7628an.dtsi

@@ -266,85 +266,85 @@
 
 		spi_pins: spi_pins {
 			spi_pins {
-				ralink,group = "spi";
-				ralink,function = "spi";
+				groups = "spi";
+				function = "spi";
 			};
 		};
 
 		spi_cs1_pins: spi_cs1 {
 			spi_cs1 {
-				ralink,group = "spi cs1";
-				ralink,function = "spi cs1";
+				groups = "spi cs1";
+				function = "spi cs1";
 			};
 		};
 
 		i2c_pins: i2c_pins {
 			i2c_pins {
-				ralink,group = "i2c";
-				ralink,function = "i2c";
+				groups = "i2c";
+				function = "i2c";
 			};
 		};
 
 		i2s_pins: i2s {
 			i2s {
-				ralink,group = "i2s";
-				ralink,function = "i2s";
+				groups = "i2s";
+				function = "i2s";
 			};
 		};
 
 		uart0_pins: uartlite {
 			uartlite {
-				ralink,group = "uart0";
-				ralink,function = "uart0";
+				groups = "uart0";
+				function = "uart0";
 			};
 		};
 
 		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";
 			};
 		};
 
 		sdxc_pins: sdxc {
 			sdxc {
-				ralink,group = "sdmode";
-				ralink,function = "sdxc";
+				groups = "sdmode";
+				function = "sdxc";
 			};
 		};
 
 		pwm0_pins: pwm0 {
 			pwm0 {
-				ralink,group = "pwm0";
-				ralink,function = "pwm0";
+				groups = "pwm0";
+				function = "pwm0";
 			};
 		};
 
 		pwm1_pins: pwm1 {
 			pwm1 {
-				ralink,group = "pwm1";
-				ralink,function = "pwm1";
+				groups = "pwm1";
+				function = "pwm1";
 			};
 		};
 
 		pcm_i2s_pins: pcm_i2s {
 			pcm_i2s {
-				ralink,group = "i2s";
-				ralink,function = "pcm";
+				groups = "i2s";
+				function = "pcm";
 			};
 		};
 
 		refclk_pins: refclk {
 			refclk {
-				ralink,group = "refclk";
-				ralink,function = "refclk";
+				groups = "refclk";
+				function = "refclk";
 			};
 		};
 	};

target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts

@@ -95,18 +95,18 @@
 
 &state_default {
 	gpio {
-		ralink,group = "p0led_an", "wdt", "wled_an";
-		ralink,function = "gpio";
+		groups = "p0led_an", "wdt", "wled_an";
+		function = "gpio";
 	};
 
 	ext_lna {
-		ralink,group = "uart1";
-		ralink,function = "sw_r";
+		groups = "uart1";
+		function = "sw_r";
 	};
 
 	ext_pa {
-		ralink,group = "i2s";
-		ralink,function = "antenna";
+		groups = "i2s";
+		function = "antenna";
 	};
 };
 

target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts

@@ -111,8 +111,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart1", "wled_an", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt", "refclk", "gpio", "i2s";
-		ralink,function = "gpio";
+		groups = "uart1", "wled_an", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt", "refclk", "gpio", "i2s";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7628an_cudy_wr1000.dts

@@ -106,9 +106,9 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2s", "refclk", "wdt", "p4led_an",
+		groups = "i2s", "refclk", "wdt", "p4led_an",
 				"p3led_an", "p2led_an", "wled_an";
-		ralink,function = "gpio";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts

@@ -62,28 +62,28 @@
 
 &state_default {
 	gpio {
-		ralink,group = "gpio";
-		ralink,function = "gpio";
+		groups = "gpio";
+		function = "gpio";
 	};
 
 	i2c {
-		ralink,group = "i2c";
-		ralink,function = "gpio";
+		groups = "i2c";
+		function = "gpio";
 	};
 
 	i2s {
-		ralink,group = "i2s";
-		ralink,function = "gpio";
+		groups = "i2s";
+		function = "gpio";
 	};
 
 	spis {
-		ralink,group = "spis";
-		ralink,function = "gpio";
+		groups = "spis";
+		function = "gpio";
 	};
 
 	wdt {
-		ralink,group = "wdt";
-		ralink,function = "gpio";
+		groups = "wdt";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7628an_duzun_dm06.dts

@@ -50,8 +50,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt", "uart1";
-		ralink,function = "gpio";
+		groups = "wdt", "uart1";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts

@@ -77,8 +77,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt", "gpio", "wled_an", "p0led_an", "p1led_an", "i2s";
-		ralink,function = "gpio";
+		groups = "wdt", "gpio", "wled_an", "p0led_an", "p1led_an", "i2s";
+		function = "gpio";
 	};
 };
 

target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi

@@ -47,8 +47,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt", "wled_an", "p1led_an";
-		ralink,function = "gpio";
+		groups = "wdt", "wled_an", "p1led_an";
+		function = "gpio";
 	};
 };