From: Chuanhong Guo Date: Sun, 12 Apr 2020 12:58:29 +0000 (+0800) Subject: ramips: replace pinctrl property names X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b756ea2a909a36d7e931b96edf0d15539421c733;p=oweals%2Fopenwrt.git 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 --- diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi index 150c0e14ca..29d138c84e 100644 --- a/target/linux/ramips/dts/mt7620a.dtsi +++ b/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"; }; }; }; diff --git a/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts b/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts index 2ffe8431ee..3a84a30c61 100644 --- a/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts b/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts index fa03d14814..47a8e5a180 100644 --- a/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts b/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts index 4ba57dda41..b0ac4a37d4 100644 --- a/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts b/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts index 4953c4c906..eec7d5883e 100644 --- a/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts b/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts index 4f92993064..c32c3f017d 100644 --- a/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts b/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts index 4acab8c032..a8c6a87577 100644 --- a/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts index e77f39843d..64aafd0a52 100644 --- a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts index aed4ce1693..86420bf674 100644 --- a/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts index eeb4ee67d4..60d6d62a4e 100644 --- a/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts index 0800e3d78b..2cf26c7ddc 100644 --- a/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts b/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts index 27056a668b..59d7b34331 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts index 8a79d9a454..e8a8e65c7d 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts index 0a22eee3b5..9e60b42f71 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts index a69b17d739..a01ef25bfa 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts index 5134e9e1ca..d795c06b50 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts index 063d65a70d..71ed648d41 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts b/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts index 88bd514d53..d77a503d7a 100644 --- a/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts index d34bc1b22b..c3267bb3c0 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts b/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts index e2765b1877..97a89b896c 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi index 1202ac1b69..14ac27f2ae 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi +++ b/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"; }; }; }; diff --git a/target/linux/ramips/dts/mt7620a_engenius_esr600.dts b/target/linux/ramips/dts/mt7620a_engenius_esr600.dts index 3213132c43..d7dbb1bfa4 100644 --- a/target/linux/ramips/dts/mt7620a_engenius_esr600.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_fon_fon2601.dts b/target/linux/ramips/dts/mt7620a_fon_fon2601.dts index 33329a1049..019274a0d3 100644 --- a/target/linux/ramips/dts/mt7620a_fon_fon2601.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts index d66861c9ad..9a9d9f45ae 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300a.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts index 633253fadd..5291b5fcca 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt300n.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts b/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts index e6b30449e8..9df5f464c7 100644 --- a/target/linux/ramips/dts/mt7620a_glinet_gl-mt750.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts b/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts index 6395aa37f6..fbee809893 100644 --- a/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi b/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi index 4f4fc4a725..82bc8c9957 100644 --- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5x61.dtsi +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_hnet_c108.dts b/target/linux/ramips/dts/mt7620a_hnet_c108.dts index 49fa6b2c8e..15b2a12af7 100644 --- a/target/linux/ramips/dts/mt7620a_hnet_c108.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts b/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts index 200df6000e..1cc59e4bb6 100644 --- a/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts b/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts index 062ef93ed4..098aaa007f 100644 --- a/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_iptime_a104ns.dts b/target/linux/ramips/dts/mt7620a_iptime_a104ns.dts index 14b5071007..28963edadc 100644 --- a/target/linux/ramips/dts/mt7620a_iptime_a104ns.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts b/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts index ef4dc233ea..ce73886ade 100644 --- a/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts b/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts index e400ebcff0..c1406503eb 100644 --- a/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi index 29832ac42b..bf83400957 100644 --- a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dtsi +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_linksys_e1700.dts b/target/linux/ramips/dts/mt7620a_linksys_e1700.dts index 799d660d3c..6efe9d2b06 100644 --- a/target/linux/ramips/dts/mt7620a_linksys_e1700.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts b/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts index 57f408a648..23d08ad3e4 100644 --- a/target/linux/ramips/dts/mt7620a_microduino_microwrt.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi b/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi index 8199147165..2cd5da9b9c 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex3700_ex6130.dtsi b/target/linux/ramips/dts/mt7620a_netgear_ex3700_ex6130.dtsi index ec9b6c587e..697a661481 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_ex3700_ex6130.dtsi +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts b/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts index 98dac3f5b6..b8f86fad50 100644 --- a/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts index 5071aed165..63dde14975 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts index 92fcfdf68c..34dfc9976d 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts index 1474422a24..0d9ef767c4 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts index 15fb40fa7d..7f9fea2b07 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts b/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts index 8390d18918..3998ea6019 100644 --- a/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts b/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts index a7c614cc21..e9c2e295e4 100644 --- a/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts index 6062a76f76..28473a52c6 100644 --- a/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts index 3313c6c071..116d5874e1 100644 --- a/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts index 4b64afd228..e25b969701 100644 --- a/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts index 56f427aa8a..34f870906e 100644 --- a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-evb.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts index e106af402e..909fd7e0b2 100644 --- a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-mt7530-evb.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts b/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts index 74c82341fe..ee148dbde3 100644 --- a/target/linux/ramips/dts/mt7620a_ralink_mt7620a-v22sg-evb.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts index 35617c0880..2bbd68cf7a 100644 --- a/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_sercomm_na930.dts b/target/linux/ramips/dts/mt7620a_sercomm_na930.dts index 952f371ce0..9313e6259f 100644 --- a/target/linux/ramips/dts/mt7620a_sercomm_na930.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts index efa83eb16d..d8146218c9 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts index b1d3e23450..1d8f3316ad 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts index 7e05a2e1ea..b1cde57d77 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts index ca03d2ed78..eb5d867a19 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts index ea42ef2c54..cad83c125b 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts index c8b2794714..b6e5518f53 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_re210-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_re210-v1.dts index 49c56a8cb4..a1fa3330d7 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_re210-v1.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts b/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts index d076e10ced..1442151063 100644 --- a/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_youku_yk1.dts b/target/linux/ramips/dts/mt7620a_youku_yk1.dts index 641c05a628..a95f1e9320 100644 --- a/target/linux/ramips/dts/mt7620a_youku_yk1.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_yukai_bocco.dts b/target/linux/ramips/dts/mt7620a_yukai_bocco.dts index 94ac1dd4f9..389fa1b62f 100644 --- a/target/linux/ramips/dts/mt7620a_yukai_bocco.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts index cf9b91f564..c2c6b8b4bb 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026.dtsi b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026.dtsi index 3d971ba2c6..91bbd4a044 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026.dtsi +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts index a7779a0071..40df9424a9 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi index 82d5de4012..a2051efaad 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zte_q7.dts b/target/linux/ramips/dts/mt7620a_zte_q7.dts index fc07b57418..182b7db905 100644 --- a/target/linux/ramips/dts/mt7620a_zte_q7.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts b/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts index 563a159ffc..58c96cd197 100644 --- a/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n.dtsi b/target/linux/ramips/dts/mt7620n.dtsi index 54370a0c75..4717f6c043 100644 --- a/target/linux/ramips/dts/mt7620n.dtsi +++ b/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"; }; }; }; diff --git a/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts index 801f4c50ec..04afb68061 100644 --- a/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts b/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts index 2e7f8ea5f6..2ae2182862 100644 --- a/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts b/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts index 9db47c814c..df5761664c 100644 --- a/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts b/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts index 16eea14bdf..a2285ea707 100644 --- a/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts b/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts index cac849c919..1c45c8e8cc 100644 --- a/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts b/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts index 27703acc08..9103857f7a 100644 --- a/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts b/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts index ebd9171415..61ef68c025 100644 --- a/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts b/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts index a8d5b04b37..1d44049548 100644 --- a/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts b/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts index c48560bb94..337abbb68e 100644 --- a/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts b/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts index 6decec798d..2d7e39f912 100644 --- a/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts b/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts index 75267c68b9..2385ca92f8 100644 --- a/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi b/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi index cee1e04e81..a8d0a00441 100644 --- a/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts b/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts index 1740de16eb..381975d26f 100644 --- a/target/linux/ramips/dts/mt7620n_ravpower_wd03.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts b/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts index ddcfb1d9b5..cc817f78ef 100644 --- a/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts b/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts index 1c346856d1..8877f0f95f 100644 --- a/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts index 7a646882f3..b2a3b0d61d 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts index 41029440e8..f441e0fcb5 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts index 725a070fd6..cc3e82ab4b 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts index 12b1c5908b..c95c951d21 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts index c974c9b1d0..c8fcef1b3d 100644 --- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts index 6e8a333069..34f3e7d371 100644 --- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7628an.dtsi b/target/linux/ramips/dts/mt7628an.dtsi index acbab706b5..097fc3b4a1 100644 --- a/target/linux/ramips/dts/mt7628an.dtsi +++ b/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"; }; }; }; diff --git a/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts index 16ba376311..ada00fa3f1 100644 --- a/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts index f511833757..b617e74264 100644 --- a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts index 3d8bc15947..c977d5c993 100644 --- a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts b/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts index 955797a990..d406bac0e8 100644 --- a/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_duzun_dm06.dts b/target/linux/ramips/dts/mt7628an_duzun_dm06.dts index 7466c5fdab..4164bae184 100644 --- a/target/linux/ramips/dts/mt7628an_duzun_dm06.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts index 2a8ae960f1..4dbacba8c6 100644 --- a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi b/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi index 5e531dd63e..ea43a87372 100644 --- a/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi +++ b/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"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts index 4bdb53a0ec..ae085255b3 100644 --- a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts +++ b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts @@ -36,8 +36,8 @@ &state_default { gpio { - ralink,group = "i2c"; - ralink,function = "gpio"; + groups = "i2c"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts index 5efa352896..cd91b1587a 100644 --- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts +++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts @@ -29,8 +29,8 @@ &state_default { gpio { - ralink,group = "i2c", "refclk", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "i2c", "refclk", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts index 3783edb8ce..cae42ceb14 100644 --- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts +++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts @@ -47,8 +47,8 @@ &state_default { gpio { - ralink,group = "i2c", "refclk", "wdt", "p2led_an", "p3led_an", "wled_an"; - ralink,function = "gpio"; + groups = "i2c", "refclk", "wdt", "p2led_an", "p3led_an", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts index 16d9b56fe3..b69214ed5d 100644 --- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts +++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts @@ -24,8 +24,8 @@ &state_default { gpio { - ralink,group = "refclk", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "refclk", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_iptime.dtsi b/target/linux/ramips/dts/mt7628an_iptime.dtsi index 311cab3039..8a33c37f7a 100644 --- a/target/linux/ramips/dts/mt7628an_iptime.dtsi +++ b/target/linux/ramips/dts/mt7628an_iptime.dtsi @@ -71,8 +71,8 @@ &state_default { gpio { - ralink,group = "uart1", "wdt"; - ralink,function = "gpio"; + groups = "uart1", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_iptime_a604m.dts b/target/linux/ramips/dts/mt7628an_iptime_a604m.dts index 7e2f53f0d4..661439f03b 100644 --- a/target/linux/ramips/dts/mt7628an_iptime_a604m.dts +++ b/target/linux/ramips/dts/mt7628an_iptime_a604m.dts @@ -38,7 +38,7 @@ &state_default { gpio { - ralink,group = "i2c", "uart1", "wdt"; - ralink,function = "gpio"; + groups = "i2c", "uart1", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts index 7fe47d9853..ebc4c3d6f9 100644 --- a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts +++ b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts @@ -52,33 +52,33 @@ &state_default { gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; + groups = "gpio"; + function = "gpio"; }; refclk { - ralink,group = "refclk"; - ralink,function = "gpio"; + groups = "refclk"; + function = "gpio"; }; i2s { - ralink,group = "i2s"; - ralink,function = "gpio"; + groups = "i2s"; + function = "gpio"; }; spis { - ralink,group = "spis"; - ralink,function = "gpio"; + groups = "spis"; + function = "gpio"; }; wled_an { - ralink,group = "wled_an"; - ralink,function = "gpio"; + groups = "wled_an"; + function = "gpio"; }; wdt { - ralink,group = "wdt"; - ralink,function = "gpio"; + groups = "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts b/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts index 5558892a22..260ac14c30 100644 --- a/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts +++ b/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts @@ -9,8 +9,8 @@ &state_default { gpio { - ralink,group = "i2c"; - ralink,function = "gpio"; + groups = "i2c"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts index a7ea823583..f4fe73a526 100644 --- a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts +++ b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts @@ -76,10 +76,10 @@ &state_default { gpio { - ralink,group = "p0led_an", "p1led_an", "p2led_an", + groups = "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt", "wled_an", "uart1"; - ralink,function = "gpio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi index 679b8abee4..f8fad35c05 100644 --- a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi +++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi @@ -38,53 +38,53 @@ &state_default { gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; + groups = "gpio"; + function = "gpio"; }; perst { - ralink,group = "perst"; - ralink,function = "gpio"; + groups = "perst"; + function = "gpio"; }; refclk { - ralink,group = "refclk"; - ralink,function = "gpio"; + groups = "refclk"; + function = "gpio"; }; i2s { - ralink,group = "i2s"; - ralink,function = "gpio"; + groups = "i2s"; + function = "gpio"; }; spis { - ralink,group = "spis"; - ralink,function = "gpio"; + groups = "spis"; + function = "gpio"; }; wled_kn { - ralink,group = "wled_kn"; - ralink,function = "gpio"; + groups = "wled_kn"; + function = "gpio"; }; wled_an { - ralink,group = "wled_an"; - ralink,function = "gpio"; + groups = "wled_an"; + function = "gpio"; }; wdt { - ralink,group = "wdt"; - ralink,function = "gpio"; + groups = "wdt"; + function = "gpio"; }; pwm0 { - ralink,group = "pwm0"; - ralink,function = "gpio"; + groups = "pwm0"; + function = "gpio"; }; pwm1 { - ralink,group = "pwm1"; - ralink,function = "gpio"; + groups = "pwm1"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts index b0addf383b..2e8b45a046 100644 --- a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts +++ b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts @@ -22,8 +22,8 @@ &state_default { wled_an { - ralink,group = "wled_an"; - ralink,function = "gpio"; + groups = "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts index 229fefc52d..a231985b9c 100644 --- a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts +++ b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts @@ -46,8 +46,8 @@ &state_default { gpio { - ralink,group = "wdt", "refclk", "wled_an"; - ralink,function = "gpio"; + groups = "wdt", "refclk", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tama_w06.dts b/target/linux/ramips/dts/mt7628an_tama_w06.dts index 3d8365e90f..95a6e790fb 100644 --- a/target/linux/ramips/dts/mt7628an_tama_w06.dts +++ b/target/linux/ramips/dts/mt7628an_tama_w06.dts @@ -53,8 +53,8 @@ &state_default { gpio { - ralink,group = "uart1", "p0led_an", "wdt"; - ralink,function = "gpio"; + groups = "uart1", "p0led_an", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts index 11146fc3fd..88bdbf5bbf 100644 --- a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts +++ b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts @@ -89,8 +89,8 @@ &state_default { gpio { - ralink,group = "gpio", "i2c", "i2s", "refclk", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "gpio", "i2c", "i2s", "refclk", "uart1", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts index b439e635fc..faba69cca4 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "i2s", "gpio", "refclk", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt"; - ralink,function = "gpio"; + groups = "i2s", "gpio", "refclk", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts index 643747a3c4..6cff9c4070 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts @@ -74,9 +74,9 @@ &state_default { gpio { - ralink,group = "i2s", "gpio", "refclk", "p0led_an", "p1led_an", + groups = "i2s", "gpio", "refclk", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt"; - ralink,function = "gpio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts index 4bd21587f2..49a3bf7c7a 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts @@ -71,9 +71,9 @@ &state_default { gpio { - ralink,group = "i2c", "gpio", "p0led_an", "p1led_an", "p2led_an", + groups = "i2c", "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt", "wled_an"; - ralink,function = "gpio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts index b3c1f88ab0..3216d38908 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts @@ -72,9 +72,9 @@ &state_default { gpio { - ralink,group = "i2c", "p0led_an", "p1led_an", "p2led_an", + groups = "i2c", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "wdt", "wled_an"; - ralink,function = "gpio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts b/target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts index b065af92df..5b2b36fd4c 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts @@ -63,8 +63,8 @@ &state_default { gpio { - ralink,group = "p4led_an", "p3led_an", "p2led_an", "p1led_an", + groups = "p4led_an", "p3led_an", "p2led_an", "p1led_an", "p0led_an", "wled_an", "i2c", "wdt", "refclk"; - ralink,function = "gpio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts index af09e52ce0..21d804f77c 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts @@ -117,8 +117,8 @@ &state_default { gpio { - ralink,group = "refclk", "wdt", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an"; - ralink,function = "gpio"; + groups = "refclk", "wdt", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts index b7c907005f..d418eb9308 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts @@ -126,8 +126,8 @@ &state_default { gpio { - ralink,group = "i2s", "refclk", "wdt", "p2led_an", "p1led_an", "p0led_an", "wled_an"; - ralink,function = "gpio"; + groups = "i2s", "refclk", "wdt", "p2led_an", "p1led_an", "p0led_an", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts index bcfd449a40..67dfb81376 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts index 175f59f204..cc8fd3c352 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts @@ -62,8 +62,8 @@ &state_default { gpio { - ralink,group = "p0led_an", "p1led_an", "perst", "refclk", + groups = "p0led_an", "p1led_an", "perst", "refclk", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts index 2a83de7b21..3b497ef0c9 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts @@ -36,8 +36,8 @@ &state_default { gpio { - ralink,group = "refclk", "wdt"; - ralink,function = "gpio"; + groups = "refclk", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts index 7dd34c05ff..c81793e2ef 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts @@ -55,8 +55,8 @@ &state_default { gpio { - ralink,group = "p0led_an", "p2led_an", "perst", "refclk", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "p0led_an", "p2led_an", "perst", "refclk", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts index 3043975d79..f6d26d1fae 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts @@ -103,7 +103,7 @@ &state_default { gpio { - ralink,group = "p0led_an", "p2led_an", "perst"; - ralink,function = "gpio"; + groups = "p0led_an", "p2led_an", "perst"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts index 0a141e1a2e..3b12098ada 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "perst", "refclk", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "perst", "refclk", "uart1", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts index 74b4c4ce25..eaac196c19 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts @@ -117,8 +117,8 @@ &state_default { gpio { - ralink,group = "p4led_an", "p3led_an", "p2led_an", "p1led_an", "p0led_an", "wdt"; - ralink,function = "gpio"; + groups = "p4led_an", "p3led_an", "p2led_an", "p1led_an", "p0led_an", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts index 93e93dcd63..8f818bef62 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts index 545fc3e054..2f238189d4 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts @@ -80,8 +80,8 @@ &state_default { gpio { - ralink,group = "i2c", "i2s", "p0led_an", "p2led_an", "p4led_an", "uart1", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "i2c", "i2s", "p0led_an", "p2led_an", "p4led_an", "uart1", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi index 41bbf0ee93..69f371a724 100644 --- a/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi +++ b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi @@ -122,7 +122,7 @@ &state_default { gpio { - ralink,group = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "refclk", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "refclk", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi index 34664bde94..bffcdf67c6 100644 --- a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi +++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi @@ -16,8 +16,8 @@ &state_default { gpio { - ralink,group = "wled_an", "refclk", "wdt"; - ralink,function = "gpio"; + groups = "wled_an", "refclk", "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts index 017252f6a3..e1e9479c81 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts @@ -60,8 +60,8 @@ &state_default { gpio { - ralink,group = "i2c", "wled_an", "p0led_an", "wdt", "refclk"; - ralink,function = "gpio"; + groups = "i2c", "wled_an", "p0led_an", "wdt", "refclk"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts index 4f4087eefc..bee13a9683 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts @@ -55,8 +55,8 @@ &state_default { gpio { - ralink,group = "i2c", "wled_an", "gpio", "refclk", "wdt", "p0led_an"; - ralink,function = "gpio"; + groups = "i2c", "wled_an", "gpio", "refclk", "wdt", "p0led_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi index 581a99eef5..252ffd71f5 100644 --- a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi +++ b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi @@ -48,43 +48,43 @@ &state_default { gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; + groups = "gpio"; + function = "gpio"; }; perst { - ralink,group = "perst"; - ralink,function = "gpio"; + groups = "perst"; + function = "gpio"; }; refclk { - ralink,group = "refclk"; - ralink,function = "gpio"; + groups = "refclk"; + function = "gpio"; }; i2s { - ralink,group = "i2s"; - ralink,function = "gpio"; + groups = "i2s"; + function = "gpio"; }; spis { - ralink,group = "spis"; - ralink,function = "gpio"; + groups = "spis"; + function = "gpio"; }; wled_kn { - ralink,group = "wled_kn"; - ralink,function = "gpio"; + groups = "wled_kn"; + function = "gpio"; }; wled_an { - ralink,group = "wled_an"; - ralink,function = "wled_an"; + groups = "wled_an"; + function = "wled_an"; }; wdt { - ralink,group = "wdt"; - ralink,function = "gpio"; + groups = "wdt"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts index bcea56517b..0aeff750e9 100644 --- a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts +++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts @@ -81,28 +81,28 @@ &state_default { gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; + groups = "gpio"; + function = "gpio"; }; i2s { - ralink,group = "i2s"; - ralink,function = "gpio"; + groups = "i2s"; + function = "gpio"; }; wdt { - ralink,group = "wdt"; - ralink,function = "gpio"; + groups = "wdt"; + function = "gpio"; }; i2c { - ralink,group = "i2c"; - ralink,function = "gpio"; + groups = "i2c"; + function = "gpio"; }; refclk { - ralink,group = "refclk"; - ralink,function = "gpio"; + groups = "refclk"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts index 8a8ab94a4e..f2fec2815b 100644 --- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts +++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts @@ -25,7 +25,7 @@ &state_default { gpio { - ralink,group = "i2c", "gpio"; - ralink,function = "gpio"; + groups = "i2c", "gpio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts index 32b5f53d2a..a111a67560 100644 --- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts +++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts @@ -28,16 +28,16 @@ &state_default { gpio { - ralink,group = "gpio"; - ralink,function = "gpio"; + groups = "gpio"; + function = "gpio"; }; }; &pinctrl { led_pins: led { gpio { - ralink,group = "wled_an"; - ralink,function = "gpio"; + groups = "wled_an"; + function = "gpio"; }; }; }; diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts index cb91e15aa9..377f71186c 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts +++ b/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts @@ -119,8 +119,8 @@ &state_default { gpio { - ralink,group = "gpio", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "gpio", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts index b565b106f3..398d16817f 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts +++ b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts @@ -53,8 +53,8 @@ &state_default { gpio { - ralink,group = "gpio", "refclk", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "gpio", "refclk", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts index 231780a252..d674d6e9c1 100644 --- a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts +++ b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts @@ -56,8 +56,8 @@ &state_default { gpio { - ralink,group = "p0led_an", "p1led_an", "p4led_an", "wdt", "wled_an"; - ralink,function = "gpio"; + groups = "p0led_an", "p1led_an", "p4led_an", "wdt", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts index bc1000b7dc..e31209f391 100644 --- a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts +++ b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts @@ -203,7 +203,7 @@ &state_default { gpio { - ralink,group = "gpio", "i2s", "refclk", "spi cs1", "uart1", "wled_an"; - ralink,function = "gpio"; + groups = "gpio", "i2s", "refclk", "spi cs1", "uart1", "wled_an"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880.dtsi b/target/linux/ramips/dts/rt2880.dtsi index 762fe49e7c..321c1b14cf 100644 --- a/target/linux/ramips/dts/rt2880.dtsi +++ b/target/linux/ramips/dts/rt2880.dtsi @@ -80,7 +80,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 ]; @@ -94,7 +94,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 ]; @@ -110,7 +110,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 ]; @@ -153,29 +153,29 @@ state_default: pinctrl0 { sdram { - ralink,group = "sdram"; - ralink,function = "sdram"; + groups = "sdram"; + function = "sdram"; }; }; 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"; }; }; uartlite_pins: uartlite { uart { - ralink,group = "uartlite"; - ralink,function = "uartlite"; + groups = "uartlite"; + function = "uartlite"; }; }; }; diff --git a/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts index 8a472626bd..90196849ca 100644 --- a/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts +++ b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts @@ -84,8 +84,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi", "uartlite"; - ralink,function = "gpio"; + groups = "i2c", "spi", "uartlite"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts b/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts index 3e6691287b..5890f9958a 100644 --- a/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts +++ b/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts @@ -94,8 +94,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi", "uartlite"; - ralink,function = "gpio"; + groups = "i2c", "spi", "uartlite"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880_asus_rt-n15.dts b/target/linux/ramips/dts/rt2880_asus_rt-n15.dts index 6830fc5bac..9bd080ea44 100644 --- a/target/linux/ramips/dts/rt2880_asus_rt-n15.dts +++ b/target/linux/ramips/dts/rt2880_asus_rt-n15.dts @@ -94,8 +94,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartlite", "mdio"; - ralink,function = "gpio"; + groups = "i2c", "uartlite", "mdio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts b/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts index 2f0475b33c..3d3a0e84e9 100644 --- a/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts +++ b/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts @@ -195,8 +195,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "mdio", "uartlite"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "mdio", "uartlite"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts b/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts index ff7660723a..9a8e052e12 100644 --- a/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts +++ b/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts @@ -115,8 +115,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartlite", "mdio"; - ralink,function = "gpio"; + groups = "i2c", "uartlite", "mdio"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts b/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts index cf5a3cf2c8..ed44f10f93 100644 --- a/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts +++ b/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts @@ -119,8 +119,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartlite", "pci"; - ralink,function = "gpio"; + groups = "i2c", "uartlite", "pci"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050.dtsi b/target/linux/ramips/dts/rt3050.dtsi index 84ddb061e6..c9cc9c432a 100644 --- a/target/linux/ramips/dts/rt3050.dtsi +++ b/target/linux/ramips/dts/rt3050.dtsi @@ -109,7 +109,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 ]; @@ -129,7 +129,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 ]; @@ -145,7 +145,7 @@ #gpio-cells = <2>; ralink,gpio-base = <40>; - ralink,nr-gpio = <12>; + ralink,num-gpios = <12>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -245,36 +245,36 @@ state_default: pinctrl0 { sdram { - ralink,group = "sdram"; - ralink,function = "sdram"; + groups = "sdram"; + function = "sdram"; }; }; 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"; }; }; rgmii_pins: rgmii { rgmii { - ralink,group = "rgmii"; - ralink,function = "rgmii"; + groups = "rgmii"; + function = "rgmii"; }; }; uartlite_pins: uartlite { uart { - ralink,group = "uartlite"; - ralink,function = "uartlite"; + groups = "uartlite"; + function = "uartlite"; }; }; }; diff --git a/target/linux/ramips/dts/rt3050_8devices_carambola.dts b/target/linux/ramips/dts/rt3050_8devices_carambola.dts index aa9cf5927f..69eea2c7b7 100644 --- a/target/linux/ramips/dts/rt3050_8devices_carambola.dts +++ b/target/linux/ramips/dts/rt3050_8devices_carambola.dts @@ -59,8 +59,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi b/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi index 32fbe68f10..0f07e25685 100644 --- a/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi +++ b/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi @@ -43,8 +43,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi index 1172c74831..be57cd8e57 100644 --- a/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi +++ b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi @@ -83,8 +83,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts b/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts index 0289e11104..9909fab0ae 100644 --- a/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts +++ b/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts @@ -90,8 +90,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts b/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts index a4b1c98015..3603f163b8 100644 --- a/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts +++ b/target/linux/ramips/dts/rt3050_asus_rt-g32-b1.dts @@ -69,8 +69,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_asus_wl-330n.dts b/target/linux/ramips/dts/rt3050_asus_wl-330n.dts index 3a34449166..36d80086dc 100644 --- a/target/linux/ramips/dts/rt3050_asus_wl-330n.dts +++ b/target/linux/ramips/dts/rt3050_asus_wl-330n.dts @@ -90,8 +90,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts b/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts index 23f8457fd5..76de3063c4 100644 --- a/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts +++ b/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts @@ -95,8 +95,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts b/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts index 679173c799..bfcdab6e08 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts @@ -92,8 +92,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts index 945182e693..46988d2e9a 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts @@ -102,8 +102,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts index 864f864517..7eabafc01c 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts @@ -102,8 +102,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts index a9d0dc985c..2137aa2f88 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts @@ -112,7 +112,7 @@ &state_default { gpio { - ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts index a0f3659128..48561835dc 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts @@ -107,8 +107,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts b/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts index edd95a756a..d963aba25e 100644 --- a/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts +++ b/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts @@ -100,8 +100,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts b/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts index 31d311f72e..11912d79c5 100644 --- a/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts +++ b/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts @@ -87,8 +87,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_huawei_d105.dts b/target/linux/ramips/dts/rt3050_huawei_d105.dts index ca30791d8d..1f5fbc9379 100644 --- a/target/linux/ramips/dts/rt3050_huawei_d105.dts +++ b/target/linux/ramips/dts/rt3050_huawei_d105.dts @@ -83,8 +83,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts b/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts index 8709a21abf..9916efdb7c 100644 --- a/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts +++ b/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts @@ -39,8 +39,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_netcore_nw718.dts b/target/linux/ramips/dts/rt3050_netcore_nw718.dts index fe13d9ac9b..e17d5a8fcd 100644 --- a/target/linux/ramips/dts/rt3050_netcore_nw718.dts +++ b/target/linux/ramips/dts/rt3050_netcore_nw718.dts @@ -97,8 +97,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts b/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts index 66abb4853f..b6308290e1 100644 --- a/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts +++ b/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts @@ -89,8 +89,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts b/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts index 9532d922f9..280246cf9a 100644 --- a/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts +++ b/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts @@ -79,8 +79,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_tenda_w150m.dts b/target/linux/ramips/dts/rt3050_tenda_w150m.dts index 6e2ea916ed..9c28c2999d 100644 --- a/target/linux/ramips/dts/rt3050_tenda_w150m.dts +++ b/target/linux/ramips/dts/rt3050_tenda_w150m.dts @@ -107,8 +107,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts b/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts index 66a6372065..a7c5f8342f 100644 --- a/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts +++ b/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts @@ -87,8 +87,8 @@ &state_default { gpio { - ralink,group = "uartf"; - ralink,function = "gpio"; + groups = "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_accton_wr6202.dts b/target/linux/ramips/dts/rt3052_accton_wr6202.dts index bc7a79c977..fa5f740e17 100644 --- a/target/linux/ramips/dts/rt3052_accton_wr6202.dts +++ b/target/linux/ramips/dts/rt3052_accton_wr6202.dts @@ -95,8 +95,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts b/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts index 489b85338d..cbe04e321f 100644 --- a/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts +++ b/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts @@ -93,8 +93,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_argus_atp-52b.dts b/target/linux/ramips/dts/rt3052_argus_atp-52b.dts index 3170f88d90..6d466cd57d 100644 --- a/target/linux/ramips/dts/rt3052_argus_atp-52b.dts +++ b/target/linux/ramips/dts/rt3052_argus_atp-52b.dts @@ -85,8 +85,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts b/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts index f3a21fadaa..23418ec5fc 100644 --- a/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts +++ b/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts @@ -79,8 +79,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts b/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts index 20e287b1cc..7382980887 100644 --- a/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts +++ b/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts @@ -87,8 +87,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts index cbb8b7b947..b364c3a865 100644 --- a/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts +++ b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts @@ -104,8 +104,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts b/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts index 8eb02f14c2..4541f99464 100644 --- a/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts +++ b/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts @@ -105,8 +105,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts b/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts index af2a5bc9b5..b14a4fe5c1 100644 --- a/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts +++ b/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts @@ -111,8 +111,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts b/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts index 90e7ee81c0..9e3d2d4d84 100644 --- a/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts +++ b/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts @@ -109,8 +109,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts b/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts index 60ef24db25..a506b792ef 100644 --- a/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts +++ b/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts @@ -114,8 +114,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts b/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts index 82ab9db6f7..99ce63ba5a 100644 --- a/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts +++ b/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts @@ -87,8 +87,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts b/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts index 8ff73bdc58..37ae9438f7 100644 --- a/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts +++ b/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts @@ -95,8 +95,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts b/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts index 0d94db8553..b954cdfa61 100644 --- a/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts +++ b/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts @@ -76,8 +76,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_huawei_hg255d.dts b/target/linux/ramips/dts/rt3052_huawei_hg255d.dts index 24eb32005e..ac60f2b7d2 100644 --- a/target/linux/ramips/dts/rt3052_huawei_hg255d.dts +++ b/target/linux/ramips/dts/rt3052_huawei_hg255d.dts @@ -121,8 +121,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts b/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts index 936de03913..15eceec661 100644 --- a/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts +++ b/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts @@ -74,8 +74,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts b/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts index 93ed7029d0..9a23ee63da 100644 --- a/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts +++ b/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts @@ -120,8 +120,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts b/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts index 7f11bb57fd..7468441ae2 100644 --- a/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts +++ b/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts @@ -105,8 +105,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts b/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts index 3954ce4e77..60f637f3c4 100644 --- a/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts +++ b/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts @@ -133,8 +133,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_nexaira_bc2.dts b/target/linux/ramips/dts/rt3052_nexaira_bc2.dts index 80fbfce07c..05f20cb863 100644 --- a/target/linux/ramips/dts/rt3052_nexaira_bc2.dts +++ b/target/linux/ramips/dts/rt3052_nexaira_bc2.dts @@ -71,8 +71,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts b/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts index ac0e65be6d..0c2f46d885 100644 --- a/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts +++ b/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts b/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts index f57522571c..8f0a3567ce 100644 --- a/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts +++ b/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts @@ -80,8 +80,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts b/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts index e21926ce1d..b3f00da2f6 100644 --- a/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts +++ b/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts @@ -104,8 +104,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts b/target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts index 00b479b7b6..83854b3e6c 100644 --- a/target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts +++ b/target/linux/ramips/dts/rt3052_planex_mzk-wdpr.dts @@ -69,8 +69,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_poray_ip2202.dts b/target/linux/ramips/dts/rt3052_poray_ip2202.dts index a754136198..c7126bc05f 100644 --- a/target/linux/ramips/dts/rt3052_poray_ip2202.dts +++ b/target/linux/ramips/dts/rt3052_poray_ip2202.dts @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts b/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts index 7a8a85b5dd..24a8346bc8 100644 --- a/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts +++ b/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts b/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts index 6816305e27..17dee2d153 100644 --- a/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts +++ b/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts @@ -87,8 +87,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts b/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts index 2b92f6bf12..c8a1b125ec 100644 --- a/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts +++ b/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts @@ -98,8 +98,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts b/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts index 664bced348..e158cbee3c 100644 --- a/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts +++ b/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts @@ -82,8 +82,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_tenda_3g300m.dts b/target/linux/ramips/dts/rt3052_tenda_3g300m.dts index 8189297494..97b2be0885 100644 --- a/target/linux/ramips/dts/rt3052_tenda_3g300m.dts +++ b/target/linux/ramips/dts/rt3052_tenda_3g300m.dts @@ -112,8 +112,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts b/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts index a25d2c56b9..54fd6d785e 100644 --- a/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts +++ b/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi index 2718946396..4994d65e1a 100644 --- a/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi +++ b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi @@ -62,8 +62,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts b/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts index d8739d7586..352459ab2a 100644 --- a/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts +++ b/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts @@ -81,8 +81,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts b/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts index 489772940b..df447134c1 100644 --- a/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts +++ b/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts @@ -102,8 +102,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts index 823913cfdb..042193fb57 100644 --- a/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts +++ b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts @@ -102,8 +102,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts index 436743cff3..b4e01b05d3 100644 --- a/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts +++ b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts @@ -101,8 +101,8 @@ &state_default { gpio { - ralink,group = "uartf"; - ralink,function = "gpio"; + groups = "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts b/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts index 608f21ddfc..9fd3b3eb32 100644 --- a/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts +++ b/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts @@ -87,8 +87,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3352.dtsi b/target/linux/ramips/dts/rt3352.dtsi index 548a6bb84a..7b7ef13e4b 100644 --- a/target/linux/ramips/dts/rt3352.dtsi +++ b/target/linux/ramips/dts/rt3352.dtsi @@ -107,7 +107,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 ]; @@ -126,7 +126,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 ]; @@ -142,7 +142,7 @@ #gpio-cells = <2>; ralink,gpio-base = <40>; - ralink,nr-gpio = <6>; + ralink,num-gpios = <6>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -261,43 +261,43 @@ i2c_pins: i2c_pins { i2c_pins { - ralink,group = "i2c"; - ralink,function = "i2c"; + groups = "i2c"; + function = "i2c"; }; }; mdio_pins: mdio { mdio { - ralink,group = "mdio"; - ralink,function = "mdio"; + groups = "mdio"; + function = "mdio"; }; }; rgmii_pins: rgmii { rgmii { - ralink,group = "rgmii"; - ralink,function = "rgmii"; + groups = "rgmii"; + function = "rgmii"; }; }; spi_pins: spi_pins { spi_pins { - ralink,group = "spi"; - ralink,function = "spi"; + groups = "spi"; + function = "spi"; }; }; spi_cs1: spi1 { spi1 { - ralink,group = "spi_cs1"; - ralink,function = "spi_cs1"; + groups = "spi_cs1"; + function = "spi_cs1"; }; }; uartlite_pins: uartlite { uart { - ralink,group = "uartlite"; - ralink,function = "uartlite"; + groups = "uartlite"; + function = "uartlite"; }; }; }; diff --git a/target/linux/ramips/dts/rt3352_allnet_all5002.dts b/target/linux/ramips/dts/rt3352_allnet_all5002.dts index ea5386c5e4..8f66a7ea4d 100644 --- a/target/linux/ramips/dts/rt3352_allnet_all5002.dts +++ b/target/linux/ramips/dts/rt3352_allnet_all5002.dts @@ -91,8 +91,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts b/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts index 72145b4e44..fa82246f31 100644 --- a/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts +++ b/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts @@ -107,8 +107,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts index c85f72d019..e52a838b1f 100644 --- a/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts +++ b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts @@ -84,8 +84,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts b/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts index fde9b8198d..d70ddb2d4a 100644 --- a/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts +++ b/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts @@ -102,8 +102,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "rgmii", "mdio", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts index 4f9bc9843a..ed3ac792c4 100644 --- a/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts +++ b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts @@ -107,8 +107,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3662_dlink_dir-645.dts b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts index 235bcf8793..5973e0e175 100644 --- a/target/linux/ramips/dts/rt3662_dlink_dir-645.dts +++ b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts @@ -123,8 +123,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts index 233a7d37cc..9f8298b0b3 100644 --- a/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts +++ b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts @@ -123,8 +123,8 @@ &state_default { gpio { - ralink,group = "spi", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "spi", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3662_omnima_hpm.dts b/target/linux/ramips/dts/rt3662_omnima_hpm.dts index 7ac16cbf99..ee36547798 100644 --- a/target/linux/ramips/dts/rt3662_omnima_hpm.dts +++ b/target/linux/ramips/dts/rt3662_omnima_hpm.dts @@ -128,8 +128,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts index aaa0985bf8..9b1c41cde0 100644 --- a/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts +++ b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts @@ -115,8 +115,8 @@ &state_default { gpio { - ralink,group = "i2c", "spi"; - ralink,function = "gpio"; + groups = "i2c", "spi"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi index fffac16911..35a1128bfc 100644 --- a/target/linux/ramips/dts/rt3883.dtsi +++ b/target/linux/ramips/dts/rt3883.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 ]; @@ -130,7 +130,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 ]; @@ -146,7 +146,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 ]; @@ -162,7 +162,7 @@ #gpio-cells = <2>; ralink,gpio-base = <72>; - ralink,nr-gpio = <24>; + ralink,num-gpios = <24>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -281,36 +281,36 @@ 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"; }; }; spi_cs1: spi1 { spi1 { - ralink,group = "pci"; - ralink,function = "pci-func"; + groups = "pci"; + function = "pci-func"; }; }; uartlite_pins: uartlite { uart { - ralink,group = "uartlite"; - ralink,function = "uartlite"; + groups = "uartlite"; + function = "uartlite"; }; }; pci_pins: pci { pci { - ralink,group = "pci"; - ralink,function = "pci-fnc"; + groups = "pci"; + function = "pci-fnc"; }; }; }; diff --git a/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi b/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi index 47e24c66d0..f1c9a1d52f 100644 --- a/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi +++ b/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi @@ -75,8 +75,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts b/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts index b41bb74214..e43562d684 100644 --- a/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts +++ b/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts @@ -59,8 +59,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts index 6830f736fa..118b3bb5b9 100644 --- a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts +++ b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts @@ -91,8 +91,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts index 6d234796d8..2c750eb1d7 100644 --- a/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts +++ b/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts @@ -90,8 +90,8 @@ &state_default { gpio { - ralink,group = "spi", "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "spi", "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi index 89a3903118..9be841f8cb 100644 --- a/target/linux/ramips/dts/rt5350.dtsi +++ b/target/linux/ramips/dts/rt5350.dtsi @@ -116,7 +116,7 @@ #gpio-cells = <2>; ralink,gpio-base = <0>; - ralink,nr-gpio = <22>; + ralink,num-gpios = <22>; ralink,register-map = [ 00 04 08 0c 20 24 28 2c 30 34 ]; @@ -133,7 +133,7 @@ #gpio-cells = <2>; ralink,gpio-base = <22>; - ralink,nr-gpio = <6>; + ralink,num-gpios = <6>; ralink,register-map = [ 00 04 08 0c 10 14 18 1c 20 24 ]; @@ -275,43 +275,43 @@ 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"; }; }; phy_led_pins: phy_led { phy_led { - ralink,group = "led"; - ralink,function = "led"; + groups = "led"; + function = "led"; }; }; uartlite_pins: uartlite { uart { - ralink,group = "uartlite"; - ralink,function = "uartlite"; + groups = "uartlite"; + function = "uartlite"; }; }; uartf_pins: uartf { uartf { - ralink,group = "uartf"; - ralink,function = "uartf"; + groups = "uartf"; + function = "uartf"; }; }; spi_cs1: spi1 { spi1 { - ralink,group = "spi_cs1"; - ralink,function = "spi_cs1"; + groups = "spi_cs1"; + function = "spi_cs1"; }; }; }; diff --git a/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi b/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi index 6ce6c3f4ab..d9e1cb5397 100644 --- a/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi +++ b/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi @@ -43,8 +43,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_airlive_air3gii.dts b/target/linux/ramips/dts/rt5350_airlive_air3gii.dts index 50d08a8fec..f7be825d12 100644 --- a/target/linux/ramips/dts/rt5350_airlive_air3gii.dts +++ b/target/linux/ramips/dts/rt5350_airlive_air3gii.dts @@ -83,8 +83,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_allnet_all5003.dts b/target/linux/ramips/dts/rt5350_allnet_all5003.dts index 0571b89fb9..a5500c5c20 100644 --- a/target/linux/ramips/dts/rt5350_allnet_all5003.dts +++ b/target/linux/ramips/dts/rt5350_allnet_all5003.dts @@ -91,8 +91,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi index 974a902e2d..7dafd0548a 100644 --- a/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi +++ b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi @@ -53,8 +53,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag"; - ralink,function = "gpio"; + groups = "i2c", "jtag"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_belkin_f7c027.dts b/target/linux/ramips/dts/rt5350_belkin_f7c027.dts index 0869b43158..a89cbad80b 100644 --- a/target/linux/ramips/dts/rt5350_belkin_f7c027.dts +++ b/target/linux/ramips/dts/rt5350_belkin_f7c027.dts @@ -135,7 +135,7 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts index c08a76d554..c52e75cab5 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts @@ -90,8 +90,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf", "led"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf", "led"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts b/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts index b5e966cfdd..4fd2755d90 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts @@ -90,8 +90,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts b/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts index c1eb2a8d1e..9556287760 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts @@ -112,8 +112,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts b/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts index e791c9a5f2..d7dffd6c0c 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts @@ -90,8 +90,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts b/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts index c5ccfd0c97..e467c82688 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts @@ -127,8 +127,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts b/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts index c3e76cb132..c3016bcda3 100644 --- a/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts +++ b/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts @@ -57,8 +57,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts b/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts index 88aec94711..043cdf4826 100644 --- a/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts +++ b/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts @@ -105,8 +105,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf", "led"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf", "led"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts b/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts index c55fa68920..bcb828ac1c 100644 --- a/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts +++ b/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts @@ -101,8 +101,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts b/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts index c6eda2e272..95d47e401b 100644 --- a/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts +++ b/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts @@ -94,13 +94,13 @@ &state_default { gpio { - ralink,group = "i2c", "jtag"; - ralink,function = "gpio"; + groups = "i2c", "jtag"; + function = "gpio"; }; uartf_gpio { - ralink,group = "uartf"; - ralink,function = "gpio uartf"; + groups = "uartf"; + function = "gpio uartf"; }; }; diff --git a/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts b/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts index 7f71e3fa3f..2c80536d94 100644 --- a/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts +++ b/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts @@ -95,8 +95,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_intenso_memory2move.dts b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts index 57a9bec410..14794b510b 100644 --- a/target/linux/ramips/dts/rt5350_intenso_memory2move.dts +++ b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts @@ -94,8 +94,8 @@ &state_default { gpio { - ralink,group = "i2c", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi b/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi index 10b51d7c5f..ef445603cc 100644 --- a/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi +++ b/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi @@ -20,8 +20,8 @@ &state_default { gpio { - ralink,group = "jtag", "uartf"; - ralink,function = "gpio"; + groups = "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi b/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi index 17f1497bfc..a0768587a4 100644 --- a/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi +++ b/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi @@ -127,8 +127,8 @@ &state_default { gpio { - ralink,group = "jtag", "led", "spi_cs1"; - ralink,function = "gpio"; + groups = "jtag", "led", "spi_cs1"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi index 8665c7dd73..0a49e22de2 100644 --- a/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi +++ b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi @@ -55,12 +55,12 @@ &state_default { gpio { - ralink,group = "jtag"; - ralink,function = "gpio"; + groups = "jtag"; + function = "gpio"; }; uartf_gpio { - ralink,group = "uartf"; - ralink,function = "gpio uartf"; + groups = "uartf"; + function = "gpio uartf"; }; }; diff --git a/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts b/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts index 4e7b6e267b..3e635d9082 100644 --- a/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts +++ b/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts @@ -57,8 +57,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts b/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts index bddf7adb5f..bc92859880 100644 --- a/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts +++ b/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts @@ -91,8 +91,8 @@ &state_default { gpio { - ralink,group = "jtag", "uartf", "led"; - ralink,function = "gpio"; + groups = "jtag", "uartf", "led"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_poray_m3.dts b/target/linux/ramips/dts/rt5350_poray_m3.dts index 294cf3367f..6f23cd160d 100644 --- a/target/linux/ramips/dts/rt5350_poray_m3.dts +++ b/target/linux/ramips/dts/rt5350_poray_m3.dts @@ -86,8 +86,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_poray_m4.dtsi b/target/linux/ramips/dts/rt5350_poray_m4.dtsi index db39c77050..f6fb9011b3 100644 --- a/target/linux/ramips/dts/rt5350_poray_m4.dtsi +++ b/target/linux/ramips/dts/rt5350_poray_m4.dtsi @@ -36,8 +36,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_poray_x5.dts b/target/linux/ramips/dts/rt5350_poray_x5.dts index 4a65acc5c6..419d57487c 100644 --- a/target/linux/ramips/dts/rt5350_poray_x5.dts +++ b/target/linux/ramips/dts/rt5350_poray_x5.dts @@ -118,8 +118,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_poray_x8.dts b/target/linux/ramips/dts/rt5350_poray_x8.dts index b02056379b..db48a03407 100644 --- a/target/linux/ramips/dts/rt5350_poray_x8.dts +++ b/target/linux/ramips/dts/rt5350_poray_x8.dts @@ -79,8 +79,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_tenda_3g150b.dts b/target/linux/ramips/dts/rt5350_tenda_3g150b.dts index ece2db036c..06b632bc5b 100644 --- a/target/linux/ramips/dts/rt5350_tenda_3g150b.dts +++ b/target/linux/ramips/dts/rt5350_tenda_3g150b.dts @@ -101,8 +101,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf", "led"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf", "led"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts b/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts index b485e1cefa..108d1f0389 100644 --- a/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts +++ b/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts @@ -100,8 +100,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts index 8a3485971d..73cd4274f6 100644 --- a/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts +++ b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts @@ -106,8 +106,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf", "led"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf", "led"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi index f5642744d8..76ed58e8f6 100644 --- a/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi +++ b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi @@ -166,8 +166,8 @@ &state_default { gpio { - ralink,group = "jtag", "uartf", "led"; - ralink,function = "gpio"; + groups = "jtag", "uartf", "led"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts b/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts index 4d1093d832..7fb1fb93da 100644 --- a/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts +++ b/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts @@ -49,8 +49,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts b/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts index ce747994d3..ceab5394e5 100644 --- a/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts +++ b/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts @@ -130,8 +130,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag" ; - ralink,function = "gpio"; + groups = "i2c", "jtag" ; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts index 56e3f0854d..0dbdc6ea6d 100644 --- a/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts +++ b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts @@ -84,8 +84,8 @@ &state_default { gpio { - ralink,group = "jtag", "uartf"; - ralink,function = "gpio"; + groups = "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts b/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts index f96ad9092a..c50a08d98a 100644 --- a/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts +++ b/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts @@ -92,8 +92,8 @@ &state_default { gpio { - ralink,group = "i2c", "jtag", "uartf"; - ralink,function = "gpio"; + groups = "i2c", "jtag", "uartf"; + function = "gpio"; }; }; diff --git a/target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch b/target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch index a374e01b59..497110bb37 100644 --- a/target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch +++ b/target/linux/ramips/patches-4.14/0025-pinctrl-ralink-add-pinctrl-driver.patch @@ -156,8 +156,8 @@ Signed-off-by: John Crispin + struct pinctrl_map **map) +{ + const char *function; -+ int func = of_property_read_string(np, "ralink,function", &function); -+ int grps = of_property_count_strings(np, "ralink,group"); ++ int func = of_property_read_string(np, "function", &function); ++ int grps = of_property_count_strings(np, "groups"); + int i; + + if (func || !grps) @@ -166,7 +166,7 @@ Signed-off-by: John Crispin + for (i = 0; i < grps; i++) { + const char *group; + -+ of_property_read_string_index(np, "ralink,group", i, &group); ++ of_property_read_string_index(np, "groups", i, &group); + + (*map)->type = PIN_MAP_TYPE_MUX_GROUP; + (*map)->name = function; @@ -186,7 +186,7 @@ Signed-off-by: John Crispin + struct device_node *np; + + for_each_child_of_node(np_config, np) { -+ int ret = of_property_count_strings(np, "ralink,group"); ++ int ret = of_property_count_strings(np, "groups"); + + if (ret >= 0) + max_maps += ret; @@ -482,7 +482,7 @@ Signed-off-by: John Crispin + if (!of_device_is_available(np)) + continue; + -+ ngpio = of_get_property(np, "ralink,nr-gpio", NULL); ++ ngpio = of_get_property(np, "ralink,num-gpios", NULL); + gpiobase = of_get_property(np, "ralink,gpio-base", NULL); + if (!ngpio || !gpiobase) { + dev_err(&pdev->dev, "failed to load chip info\n"); diff --git a/target/linux/ramips/patches-4.14/0026-DT-Add-documentation-for-gpio-ralink.patch b/target/linux/ramips/patches-4.14/0026-DT-Add-documentation-for-gpio-ralink.patch index 0bce0b433a..7d5f98f647 100644 --- a/target/linux/ramips/patches-4.14/0026-DT-Add-documentation-for-gpio-ralink.patch +++ b/target/linux/ramips/patches-4.14/0026-DT-Add-documentation-for-gpio-ralink.patch @@ -29,7 +29,7 @@ Cc: linux-gpio@vger.kernel.org +- reg : Physical base address and length of the controller's registers +- interrupt-parent: phandle to the INTC device node +- interrupts : Specify the INTC interrupt number -+- ralink,nr-gpio : Specify the number of GPIOs ++- ralink,num-gpios : Specify the number of GPIOs +- ralink,register-map : The register layout depends on the GPIO bank and actual + SoC type. Register offsets need to be in this order. + [ INT, EDGE, RENA, FENA, DATA, DIR, POL, SET, RESET, TOGGLE ] @@ -51,7 +51,7 @@ Cc: linux-gpio@vger.kernel.org + interrupts = <6>; + + 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 ]; diff --git a/target/linux/ramips/patches-4.14/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch b/target/linux/ramips/patches-4.14/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch index eaae0d3d02..35cedf61fd 100644 --- a/target/linux/ramips/patches-4.14/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch +++ b/target/linux/ramips/patches-4.14/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch @@ -371,7 +371,7 @@ Cc: linux-gpio@vger.kernel.org + return -EINVAL; + } + -+ ngpio = of_get_property(np, "ralink,nr-gpio", NULL); ++ ngpio = of_get_property(np, "ralink,num-gpios", NULL); + if (!ngpio) { + dev_err(&pdev->dev, "failed to read number of pins\n"); + return -EINVAL; diff --git a/target/linux/ramips/patches-5.4/0026-DT-Add-documentation-for-gpio-ralink.patch b/target/linux/ramips/patches-5.4/0026-DT-Add-documentation-for-gpio-ralink.patch index 0bce0b433a..7d5f98f647 100644 --- a/target/linux/ramips/patches-5.4/0026-DT-Add-documentation-for-gpio-ralink.patch +++ b/target/linux/ramips/patches-5.4/0026-DT-Add-documentation-for-gpio-ralink.patch @@ -29,7 +29,7 @@ Cc: linux-gpio@vger.kernel.org +- reg : Physical base address and length of the controller's registers +- interrupt-parent: phandle to the INTC device node +- interrupts : Specify the INTC interrupt number -+- ralink,nr-gpio : Specify the number of GPIOs ++- ralink,num-gpios : Specify the number of GPIOs +- ralink,register-map : The register layout depends on the GPIO bank and actual + SoC type. Register offsets need to be in this order. + [ INT, EDGE, RENA, FENA, DATA, DIR, POL, SET, RESET, TOGGLE ] @@ -51,7 +51,7 @@ Cc: linux-gpio@vger.kernel.org + interrupts = <6>; + + 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 ]; diff --git a/target/linux/ramips/patches-5.4/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch b/target/linux/ramips/patches-5.4/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch index 3d78ef40c6..eae507bcd7 100644 --- a/target/linux/ramips/patches-5.4/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch +++ b/target/linux/ramips/patches-5.4/0027-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch @@ -357,7 +357,7 @@ Cc: linux-gpio@vger.kernel.org + return -EINVAL; + } + -+ ngpio = of_get_property(np, "ralink,nr-gpio", NULL); ++ ngpio = of_get_property(np, "ralink,num-gpios", NULL); + if (!ngpio) { + dev_err(&pdev->dev, "failed to read number of pins\n"); + return -EINVAL;