From: Rosen Penev Date: Sun, 21 Sep 2025 04:19:03 +0000 (-0700) Subject: treewide: gpio to gpios X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=5572d35f777573317865374e4e4711e42e4be13f;p=openwrt%2Fstaging%2Fnbd.git treewide: gpio to gpios The former is deprecated. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/20116 Signed-off-by: Robert Marko --- diff --git a/target/linux/ath79/dts/ar9344_nec_aterm.dtsi b/target/linux/ath79/dts/ar9344_nec_aterm.dtsi index ba1cd41b8e..6ae9ea4c3b 100644 --- a/target/linux/ath79/dts/ar9344_nec_aterm.dtsi +++ b/target/linux/ath79/dts/ar9344_nec_aterm.dtsi @@ -129,7 +129,7 @@ regulator-name = "usb-vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio 20 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 20 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-always-on; }; diff --git a/target/linux/mediatek/dts/mt7981b-openfi-6c.dts b/target/linux/mediatek/dts/mt7981b-openfi-6c.dts index dd62098816..7ce7a6cc5d 100644 --- a/target/linux/mediatek/dts/mt7981b-openfi-6c.dts +++ b/target/linux/mediatek/dts/mt7981b-openfi-6c.dts @@ -98,7 +98,7 @@ regulator-name = "usb_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&pio 8 GPIO_ACTIVE_LOW>; + gpios = <&pio 8 GPIO_ACTIVE_LOW>; regulator-boot-on; }; }; diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/marvell/armada-385-wd_cloud-mirror-gen2.dts b/target/linux/mvebu/files/arch/arm/boot/dts/marvell/armada-385-wd_cloud-mirror-gen2.dts index 50936e72ad..95a33b7e7a 100644 --- a/target/linux/mvebu/files/arch/arm/boot/dts/marvell/armada-385-wd_cloud-mirror-gen2.dts +++ b/target/linux/mvebu/files/arch/arm/boot/dts/marvell/armada-385-wd_cloud-mirror-gen2.dts @@ -264,7 +264,7 @@ regulator-max-microvolt = <5000000>; enable-active-high; regulator-always-on; - gpio = <&gpio0 26 GPIO_ACTIVE_HIGH>; + gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>; }; reg_usb3_1_vbus: usb3-vbus1 { @@ -276,7 +276,7 @@ regulator-max-microvolt = <5000000>; enable-active-high; regulator-always-on; - gpio = <&gpio0 27 GPIO_ACTIVE_HIGH>; + gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>; }; reg_sata0: pwr-sata0 { @@ -286,7 +286,7 @@ regulator-max-microvolt = <12000000>; enable-active-high; regulator-boot-on; - gpio = <&gpio1 23 GPIO_ACTIVE_HIGH>; + gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; }; reg_5v_sata0: v5-sata0 { @@ -312,7 +312,7 @@ regulator-max-microvolt = <12000000>; enable-active-high; regulator-boot-on; - gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>; + gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>; }; reg_5v_sata1: v5-sata1 { diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts index 023370a678..faef41fa74 100644 --- a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts +++ b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts @@ -34,7 +34,7 @@ regulator-name = "usb3_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&cp0_gpio2 23 GPIO_ACTIVE_HIGH>; + gpios = <&cp0_gpio2 23 GPIO_ACTIVE_HIGH>; enable-active-high; }; @@ -43,7 +43,7 @@ regulator-name = "LED-power"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&cp0_gpio2 27 GPIO_ACTIVE_HIGH>; + gpios = <&cp0_gpio2 27 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-boot-on; }; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax6000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax6000.dts index d74f17c5fc..b58da970a2 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax6000.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax6000.dts @@ -51,37 +51,37 @@ led_wlan_green: wlan-green { color = ; function = LED_FUNCTION_WLAN; - gpio = <&tlmm 23 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 23 GPIO_ACTIVE_HIGH>; }; led_system_blue: system-blue { color = ; function = LED_FUNCTION_POWER; - gpio = <&tlmm 24 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 24 GPIO_ACTIVE_HIGH>; }; led_system_yellow: system-yellow { color = ; function = LED_FUNCTION_POWER; - gpio = <&tlmm 25 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>; }; led_net_blue: net-blue { color = ; function = LED_FUNCTION_WAN_ONLINE; - gpio = <&tlmm 26 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 26 GPIO_ACTIVE_HIGH>; }; led_net_yellow: net-yellow { color = ; function = LED_FUNCTION_WAN; - gpio = <&tlmm 27 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 27 GPIO_ACTIVE_HIGH>; }; led_phy_green: phy-green { color = ; function = LED_FUNCTION_LAN; - gpio = <&tlmm 28 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 28 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts index f389bb0386..76d9f5e2a6 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts @@ -46,13 +46,13 @@ led_system_blue: system-blue { color = ; function = LED_FUNCTION_STATUS; - gpio = <&tlmm 24 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 24 GPIO_ACTIVE_HIGH>; }; led_status_white: status-white { color = ; function = LED_FUNCTION_STATUS; - gpio = <&tlmm 23 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 23 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts index 508ca081b4..e86e296be4 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts @@ -24,7 +24,7 @@ regulator-min-microvolt = <500000>; regulator-max-microvolt = <500000>; regulator-name = "fixed_5p0"; - gpio = <&tlmm 17 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 17 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-gl-axt1800.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-gl-axt1800.dts index 767b15e935..ca9ef8c745 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-gl-axt1800.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-gl-axt1800.dts @@ -27,7 +27,7 @@ regulator-name = "vcc_fan"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&tlmm 29 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 29 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-boot-on; }; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-glinet.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-glinet.dtsi index fb6706affd..5c862f3978 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-glinet.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-glinet.dtsi @@ -61,7 +61,7 @@ regulator-name = "usb_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&tlmm 0 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-boot-on; }; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts index 228be6b1c1..8406ed2142 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-mr7350.dts @@ -60,7 +60,7 @@ regulator-name = "usb_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&tlmm 61 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 61 GPIO_ACTIVE_LOW>; regulator-boot-on; }; }; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts index d88a1dc9e5..9dc1051e62 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts @@ -48,13 +48,13 @@ led_status_white: status-white { color = ; function = LED_FUNCTION_STATUS; - gpio = <&tlmm 56 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 56 GPIO_ACTIVE_LOW>; }; led_status_amber: status-amber { color = ; function = LED_FUNCTION_STATUS; - gpio = <&tlmm 35 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 35 GPIO_ACTIVE_LOW>; }; }; @@ -66,7 +66,7 @@ startup-delay-us = <200>; - gpio = <&tlmm 66 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 66 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-names = "default"; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts index ad41125653..c2a8ab28d4 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts @@ -97,7 +97,7 @@ regulator-name = "usb_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&tlmm 25 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 25 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts index 1b5f58e51b..09adde5dcf 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts @@ -160,7 +160,7 @@ regulator-name = "usb_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&tlmm 9 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 9 GPIO_ACTIVE_LOW>; regulator-boot-on; }; }; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rt-ax89x.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rt-ax89x.dts index dd5ce8542e..7d5468613f 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rt-ax89x.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rt-ax89x.dts @@ -146,7 +146,7 @@ regulator-name = "usb0_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&tlmm 30 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 30 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-boot-on; }; @@ -156,7 +156,7 @@ regulator-name = "usb1_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&tlmm 31 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 31 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-boot-on; }; diff --git a/target/linux/siflower/dts/sf21h8898_bananapi_bpi-rv2.dtsi b/target/linux/siflower/dts/sf21h8898_bananapi_bpi-rv2.dtsi index ec2b19e07d..4a1d75b35f 100644 --- a/target/linux/siflower/dts/sf21h8898_bananapi_bpi-rv2.dtsi +++ b/target/linux/siflower/dts/sf21h8898_bananapi_bpi-rv2.dtsi @@ -19,7 +19,7 @@ regulator-name = "usb_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio 37 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 37 GPIO_ACTIVE_HIGH>; enable-active-high; }; @@ -28,7 +28,7 @@ regulator-name = "m2keyb_pwren"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&gpio 38 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 38 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-always-on; };