ramips: mt7621: update pinctrl nodes

Upstream GPIO driver uses "groups" "function" properties

Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>

66 files changed, 156 insertions, 156 deletions

diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi
index 28ee0902cc..2db238f57f 100644
--- a/target/linux/ramips/dts/mt7621.dtsi
+++ b/target/linux/ramips/dts/mt7621.dtsi
@@ -258,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 = "pcie rst";
 			};
 		};
 
 		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";
 			};
 		};
 	};
diff --git a/target/linux/ramips/dts/mt7621_adslr_g7.dts b/target/linux/ramips/dts/mt7621_adslr_g7.dts
index 870b3834dd..91a6ab26ab 100644
--- a/target/linux/ramips/dts/mt7621_adslr_g7.dts
+++ b/target/linux/ramips/dts/mt7621_adslr_g7.dts
@@ -111,7 +111,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "wdt";
-		ralink,function = "gpio";
+		groups = "i2c", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts b/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts
index 5c274a9664..877b8d7d9d 100644
--- a/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts
+++ b/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts
@@ -123,7 +123,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt", "rgmii2", "jtag", "mdio";
-		ralink,function = "gpio";
+		groups = "wdt", "rgmii2", "jtag", "mdio";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts b/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts
index 95dc5c8d5b..266e765d7b 100644
--- a/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts
+++ b/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts
@@ -167,8 +167,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "jtag", "rgmii2", "wdt";
-		ralink,function = "gpio";
+		groups = "jtag", "rgmii2", "wdt";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi b/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi
index 5c8084d8f0..a965cb4e63 100644
--- a/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi
+++ b/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi
@@ -110,7 +110,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt", "jtag";
-		ralink,function = "gpio";
+		groups = "wdt", "jtag";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts b/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts
index 7c3524d450..ac1d88a6ce 100644
--- a/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts
+++ b/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts
@@ -140,7 +140,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "sdhci";
-		ralink,function = "gpio";
+		groups = "sdhci";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi b/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi
index a34aed2df0..c1ef3ce98c 100644
--- a/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi
+++ b/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi
@@ -149,7 +149,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart2", "uart3", "i2c";
-		ralink,function = "gpio";
+		groups = "uart2", "uart3", "i2c";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts
index 4ea2464219..8e0a1d8912 100644
--- a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts
+++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts
@@ -160,8 +160,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-		ralink,function = "gpio";
+		groups = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
index f0a79aed0b..ca060e7c0a 100644
--- a/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
+++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
@@ -155,8 +155,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-		ralink,function = "gpio";
+		groups = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts
index d0d1088b7b..85b8c5c2e0 100644
--- a/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts
+++ b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts
@@ -155,7 +155,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "jtag", "uart2", "uart3";
-		ralink,function = "gpio";
+		groups = "i2c", "jtag", "uart2", "uart3";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts b/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts
index e4662272a2..73e6e32f42 100644
--- a/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts
+++ b/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts
@@ -170,7 +170,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt", "rgmii2", "jtag", "mdio";
-		ralink,function = "gpio";
+		groups = "wdt", "rgmii2", "jtag", "mdio";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
index f49bc0e114..f83c9a4afb 100644
--- a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts
@@ -136,7 +136,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-		ralink,function = "gpio";
+		groups = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi b/target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi
index 151f3934eb..3cef0026b4 100644
--- a/target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi
+++ b/target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi
@@ -105,8 +105,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart3", "uart2", "jtag", "wdt";
-		ralink,function = "gpio";
+		groups = "uart3", "uart2", "jtag", "wdt";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts
index 2e7e9255f2..c61ef885f2 100644
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts
@@ -130,8 +130,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uart3", "jtag", "wdt";
-		ralink,function = "gpio";
+		groups = "i2c", "uart3", "jtag", "wdt";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-gst.dtsi b/target/linux/ramips/dts/mt7621_elecom_wrc-gst.dtsi
index b4acc3718e..e120ee3ca4 100644
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-gst.dtsi
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-gst.dtsi
@@ -156,8 +156,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart3", "jtag", "wdt", "sdhci";
-		ralink,function = "gpio";
+		groups = "uart3", "jtag", "wdt", "sdhci";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_firefly_firewrt.dts b/target/linux/ramips/dts/mt7621_firefly_firewrt.dts
index 4f234db49c..57318f3694 100644
--- a/target/linux/ramips/dts/mt7621_firefly_firewrt.dts
+++ b/target/linux/ramips/dts/mt7621_firefly_firewrt.dts
@@ -116,7 +116,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt", "rgmii2";
-		ralink,function = "gpio";
+		groups = "wdt", "rgmii2";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts b/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts
index 5ce4d61b57..6e3eda5290 100644
--- a/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts
+++ b/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts
@@ -116,7 +116,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "jtag", "wdt";
-		ralink,function = "gpio";
+		groups = "jtag", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts b/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts
index 236737fb93..8544e21528 100644
--- a/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts
+++ b/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts
@@ -110,7 +110,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "jtag", "rgmii2", "uart3", "wdt";
-		ralink,function = "gpio";
+		groups = "jtag", "rgmii2", "uart3", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts b/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts
index a0fd6decd7..0dae7b5ce7 100644
--- a/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts
+++ b/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts
@@ -120,7 +120,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "jtag", "rgmii2", "uart3", "wdt";
-		ralink,function = "gpio";
+		groups = "jtag", "rgmii2", "uart3", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts b/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts
index baef38fe53..d5fa290bcf 100644
--- a/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts
+++ b/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts
@@ -144,7 +144,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart3", "jtag";
-		ralink,function = "gpio";
+		groups = "uart3", "jtag";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts
index 213e706ccc..57c4638f16 100644
--- a/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts
+++ b/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts
@@ -135,8 +135,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart2", "uart3", "jtag";
-		ralink,function = "gpio";
+		groups = "uart2", "uart3", "jtag";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts
index 66edebacf1..ca08f1dabb 100644
--- a/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts
+++ b/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts
@@ -135,8 +135,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart2", "uart3", "jtag";
-		ralink,function = "gpio";
+		groups = "uart2", "uart3", "jtag";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi b/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi
index b582f32eea..c771eb20af 100644
--- a/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi
+++ b/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi
@@ -130,8 +130,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart2", "uart3", "wdt";
-		ralink,function = "gpio";
+		groups = "uart2", "uart3", "wdt";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts b/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts
index b49bfd785a..a208757c28 100644
--- a/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts
+++ b/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts
@@ -131,8 +131,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart2", "uart3", "jtag", "wdt";
-		ralink,function = "gpio";
+		groups = "uart2", "uart3", "jtag", "wdt";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_iptime_a6ns-m.dts b/target/linux/ramips/dts/mt7621_iptime_a6ns-m.dts
index ce0e60bef3..7ff01b133a 100644
--- a/target/linux/ramips/dts/mt7621_iptime_a6ns-m.dts
+++ b/target/linux/ramips/dts/mt7621_iptime_a6ns-m.dts
@@ -110,8 +110,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uart3", "jtag", "wdt";
-		ralink,function = "gpio";
+		groups = "i2c", "uart3", "jtag", "wdt";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_iptime_a8004t.dts b/target/linux/ramips/dts/mt7621_iptime_a8004t.dts
index e8a0888be6..179a9cda4c 100644
--- a/target/linux/ramips/dts/mt7621_iptime_a8004t.dts
+++ b/target/linux/ramips/dts/mt7621_iptime_a8004t.dts
@@ -128,7 +128,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt", "jtag", "i2c";
-		ralink,function = "gpio";
+		groups = "wdt", "jtag", "i2c";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts b/target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts
index efb42536bc..bdb9860291 100644
--- a/target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts
+++ b/target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts
@@ -138,7 +138,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uart3", "jtag", "wdt";
-		ralink,function = "gpio";
+		groups = "i2c", "uart3", "jtag", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts
index 3ede66344d..7f7dc9c3ea 100644
--- a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts
+++ b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts
@@ -139,7 +139,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt", "rgmii2", "jtag", "uart2", "uart3", "i2c";
-		ralink,function = "gpio";
+		groups = "wdt", "rgmii2", "jtag", "uart2", "uart3", "i2c";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_linksys_re6500.dts b/target/linux/ramips/dts/mt7621_linksys_re6500.dts
index e2c6b6e980..a97e64dbec 100644
--- a/target/linux/ramips/dts/mt7621_linksys_re6500.dts
+++ b/target/linux/ramips/dts/mt7621_linksys_re6500.dts
@@ -93,8 +93,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uart2", "uart3", "rgmii2";
-		ralink,function = "gpio";
+		groups = "i2c", "uart2", "uart3", "rgmii2";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts b/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
index 09063e677f..4a225d81c4 100644
--- a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
+++ b/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
@@ -38,16 +38,16 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart2", "rgmii2";
-		ralink,function = "gpio";
+		groups = "uart2", "rgmii2";
+		function = "gpio";
 	};
 };
 
 &pinctrl {
 	i2s_pins: i2s {
 		i2s {
-			ralink,group = "uart3";
-			ralink,function = "i2s";
+			groups = "uart3";
+			function = "i2s";
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts b/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts
index 5a330a7428..93588b5d53 100644
--- a/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts
+++ b/target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts
@@ -47,7 +47,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-		ralink,function = "gpio";
+		groups = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_mikrotik_rb750gr3.dts b/target/linux/ramips/dts/mt7621_mikrotik_rb750gr3.dts
index ebb6585c91..ebb35b9204 100644
--- a/target/linux/ramips/dts/mt7621_mikrotik_rb750gr3.dts
+++ b/target/linux/ramips/dts/mt7621_mikrotik_rb750gr3.dts
@@ -137,8 +137,8 @@
 &state_default {
 	gpio {
 		/* via gpio7 (uart3 group) the PoE status can be read */
-		ralink,group = "uart2", "uart3", "jtag", "wdt";
-		ralink,function = "gpio";
+		groups = "uart2", "uart3", "jtag", "wdt";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_mikrotik_rbm11g.dts b/target/linux/ramips/dts/mt7621_mikrotik_rbm11g.dts
index 022e8faaab..85ea796f97 100644
--- a/target/linux/ramips/dts/mt7621_mikrotik_rbm11g.dts
+++ b/target/linux/ramips/dts/mt7621_mikrotik_rbm11g.dts
@@ -145,8 +145,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart2", "wdt", "rgmii2";
-		ralink,function = "gpio";
+		groups = "uart2", "wdt", "rgmii2";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_mikrotik_rbm33g.dts b/target/linux/ramips/dts/mt7621_mikrotik_rbm33g.dts
index 90093c501c..d65d1de05c 100644
--- a/target/linux/ramips/dts/mt7621_mikrotik_rbm33g.dts
+++ b/target/linux/ramips/dts/mt7621_mikrotik_rbm33g.dts
@@ -169,8 +169,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart2", "wdt";
-		ralink,function = "gpio";
+		groups = "uart2", "wdt";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_mqmaker_witi.dts b/target/linux/ramips/dts/mt7621_mqmaker_witi.dts
index e801db22d6..f59cc57be3 100644
--- a/target/linux/ramips/dts/mt7621_mqmaker_witi.dts
+++ b/target/linux/ramips/dts/mt7621_mqmaker_witi.dts
@@ -107,7 +107,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt", "rgmii2", "jtag", "mdio";
-		ralink,function = "gpio";
+		groups = "wdt", "rgmii2", "jtag", "mdio";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_mtc_wr1201.dts b/target/linux/ramips/dts/mt7621_mtc_wr1201.dts
index 534f1a7f8f..6e1c6eabaa 100644
--- a/target/linux/ramips/dts/mt7621_mtc_wr1201.dts
+++ b/target/linux/ramips/dts/mt7621_mtc_wr1201.dts
@@ -144,7 +144,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "rgmii2";
-		ralink,function = "gpio";
+		groups = "rgmii2";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_netgear_ex6150.dts b/target/linux/ramips/dts/mt7621_netgear_ex6150.dts
index 7b9d4afa34..701f8274a4 100644
--- a/target/linux/ramips/dts/mt7621_netgear_ex6150.dts
+++ b/target/linux/ramips/dts/mt7621_netgear_ex6150.dts
@@ -234,7 +234,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "sdhci", "rgmii2", "jtag";
-		ralink,function = "gpio";
+		groups = "sdhci", "rgmii2", "jtag";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_netgear_r6700-v2.dts b/target/linux/ramips/dts/mt7621_netgear_r6700-v2.dts
index a8a3f73cf2..07b696c42d 100644
--- a/target/linux/ramips/dts/mt7621_netgear_r6700-v2.dts
+++ b/target/linux/ramips/dts/mt7621_netgear_r6700-v2.dts
@@ -116,7 +116,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart3", "uart2", "jtag", "wdt";
-		ralink,function = "gpio";
+		groups = "uart3", "uart2", "jtag", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_netgear_r6800.dts b/target/linux/ramips/dts/mt7621_netgear_r6800.dts
index 90503340e2..a64c976a44 100644
--- a/target/linux/ramips/dts/mt7621_netgear_r6800.dts
+++ b/target/linux/ramips/dts/mt7621_netgear_r6800.dts
@@ -118,7 +118,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart3", "uart2", "jtag", "wdt";
-		ralink,function = "gpio";
+		groups = "uart3", "uart2", "jtag", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi
index af8774b4da..ba0853d3ca 100644
--- a/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi
+++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi
@@ -111,7 +111,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart3", "uart2", "jtag", "wdt";
-		ralink,function = "gpio";
+		groups = "uart3", "uart2", "jtag", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
index 9d10acda7d..c7dcfae870 100644
--- a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
+++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
@@ -101,8 +101,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart3", "uart2", "jtag", "wdt";
-		ralink,function = "gpio";
+		groups = "uart3", "uart2", "jtag", "wdt";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_netis_wf2881.dts b/target/linux/ramips/dts/mt7621_netis_wf2881.dts
index d874c61886..11aa68d8f1 100644
--- a/target/linux/ramips/dts/mt7621_netis_wf2881.dts
+++ b/target/linux/ramips/dts/mt7621_netis_wf2881.dts
@@ -133,7 +133,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart3", "uart2";
-		ralink,function = "gpio";
+		groups = "uart3", "uart2";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts
index 3c43cbda51..104d10fdb3 100644
--- a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts
+++ b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts
@@ -113,7 +113,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "jtag";
-		ralink,function = "gpio";
+		groups = "i2c", "jtag";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_planex_vr500.dts b/target/linux/ramips/dts/mt7621_planex_vr500.dts
index b34f651437..30257ffb5a 100644
--- a/target/linux/ramips/dts/mt7621_planex_vr500.dts
+++ b/target/linux/ramips/dts/mt7621_planex_vr500.dts
@@ -86,7 +86,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-		ralink,function = "gpio";
+		groups = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts b/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts
index 8d73847b50..cf982d1a86 100644
--- a/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts
+++ b/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts
@@ -116,7 +116,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
-		ralink,function = "gpio";
+		groups = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts b/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts
index d02b808603..7a5b2a840c 100644
--- a/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts
+++ b/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts
@@ -113,7 +113,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart3", "jtag";
-		ralink,function = "gpio";
+		groups = "uart3", "jtag";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
index 050c39b0cc..fa85cf1017 100644
--- a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
+++ b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
@@ -133,8 +133,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "jtag", "uart2", "wdt", "rgmii2";
-		ralink,function = "gpio";
+		groups = "jtag", "uart2", "wdt", "rgmii2";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_thunder_timecloud.dts b/target/linux/ramips/dts/mt7621_thunder_timecloud.dts
index 11c3a9ba1c..195750a27d 100644
--- a/target/linux/ramips/dts/mt7621_thunder_timecloud.dts
+++ b/target/linux/ramips/dts/mt7621_thunder_timecloud.dts
@@ -101,7 +101,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uart2", "jtag";
-		ralink,function = "gpio";
+		groups = "i2c", "uart2", "jtag";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_totolink_a7000r.dts b/target/linux/ramips/dts/mt7621_totolink_a7000r.dts
index c5aaedf2c6..db6edde74d 100644
--- a/target/linux/ramips/dts/mt7621_totolink_a7000r.dts
+++ b/target/linux/ramips/dts/mt7621_totolink_a7000r.dts
@@ -110,7 +110,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "wdt";
-		ralink,function = "gpio";
+		groups = "i2c", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts b/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts
index 0f2bf9d1e4..13faedd0ea 100644
--- a/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts
@@ -157,7 +157,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "rgmii2", "wdt";
-		ralink,function = "gpio";
+		groups = "rgmii2", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts b/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts
index b81c787efc..265739bbda 100644
--- a/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts
@@ -170,7 +170,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "rgmii2", "wdt";
-		ralink,function = "gpio";
+		groups = "rgmii2", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi
index df64a3456f..1efc930d49 100644
--- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi
+++ b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi
@@ -71,8 +71,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart2", "uart3", "i2c", "pcie", "rgmii2", "jtag";
-		ralink,function = "gpio";
+		groups = "uart2", "uart3", "i2c", "pcie", "rgmii2", "jtag";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts b/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts
index 7c1ca609a7..9b3a5be444 100644
--- a/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts
+++ b/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts
@@ -135,7 +135,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uart2";
-		ralink,function = "gpio";
+		groups = "i2c", "uart2";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi b/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi
index a9c85ed288..c4116e8541 100644
--- a/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi
+++ b/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi
@@ -111,7 +111,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "jtag", "uart2", "wdt";
-		ralink,function = "gpio";
+		groups = "jtag", "uart2", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi b/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi
index bba8932749..d519961424 100644
--- a/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi
+++ b/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi
@@ -103,7 +103,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt", "rgmii2";
-		ralink,function = "gpio";
+		groups = "wdt", "rgmii2";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts
index 530717305a..a8125d355e 100644
--- a/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts
@@ -139,7 +139,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "jtag", "uart2", "uart3", "wdt";
-		ralink,function = "gpio";
+		groups = "jtag", "uart2", "uart3", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts
index 1730bc62ee..a4ffb150b3 100644
--- a/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts
@@ -193,7 +193,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "jtag", "uart2", "uart3", "wdt";
-		ralink,function = "gpio";
+		groups = "jtag", "uart2", "uart3", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts
index 469674b9c6..45d7411bd0 100644
--- a/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts
@@ -178,7 +178,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "jtag", "uart2", "uart3", "wdt";
-		ralink,function = "gpio";
+		groups = "jtag", "uart2", "uart3", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts b/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts
index d60aabccc1..618c0ab565 100644
--- a/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts
+++ b/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts
@@ -96,7 +96,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "uart3", "wdt";
-		ralink,function = "gpio";
+		groups = "uart3", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts b/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts
index ae1b20cdcb..ad8f7fdc91 100644
--- a/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts
+++ b/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts
@@ -158,7 +158,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt", "rgmii2";
-		ralink,function = "gpio";
+		groups = "wdt", "rgmii2";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts b/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts
index a0643307dc..aa749ec6b8 100644
--- a/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts
+++ b/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts
@@ -132,7 +132,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "i2c", "uart2", "uart3", "wdt";
-		ralink,function = "gpio";
+		groups = "i2c", "uart2", "uart3", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_youku_yk-l2.dts b/target/linux/ramips/dts/mt7621_youku_yk-l2.dts
index 5193a06278..49fa312f58 100644
--- a/target/linux/ramips/dts/mt7621_youku_yk-l2.dts
+++ b/target/linux/ramips/dts/mt7621_youku_yk-l2.dts
@@ -143,7 +143,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "jtag", "wdt";
-		ralink,function = "gpio";
+		groups = "jtag", "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts
index 38b939b850..6d765a2a61 100644
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts
+++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we1326.dts
@@ -30,8 +30,8 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt";
-		ralink,function = "gpio";
+		groups = "wdt";
+		function = "gpio";
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts
index 224ea6377d..8088d5e8b4 100644
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts
+++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-we3526.dts
@@ -105,7 +105,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt";
-		ralink,function = "gpio";
+		groups = "wdt";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts
index 5c22a5c7c0..fba959c8df 100644
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts
+++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts
@@ -116,7 +116,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt", "rgmii2", "jtag", "mdio";
-		ralink,function = "gpio";
+		groups = "wdt", "rgmii2", "jtag", "mdio";
+		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi
index 6a9e5e07d2..6977997633 100644
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi
+++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi
@@ -118,7 +118,7 @@
 
 &state_default {
 	gpio {
-		ralink,group = "wdt", "rgmii2", "jtag", "mdio";
-		ralink,function = "gpio";
+		groups = "wdt", "rgmii2", "jtag", "mdio";
+		function = "gpio";
 	};
 };