[PATCH] arm: dts: update arm sfp bindings to use -gpios

[PATCH] arm: dts: update arm sfp bindings to use -gpios

[Russell King (Oracle)]

It was decided that SFP should use the -gpios suffix rather than -gpio.
Update various boards to follow this.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
 arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi | 6 +++---
 arch/arm/boot/dts/armada-388-clearfog.dtsi     | 8 ++++----
 arch/arm/boot/dts/vf610-zii-cfu1.dts           | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi b/arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi
index d1452a04e904..dc625adb2979 100644
--- a/arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi
+++ b/arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi
@@ -246,9 +246,9 @@ pcie@3,0 {
 	sfp0: sfp {
 		compatible = "sff,sfp";
 		i2c-bus = <&i2c1>;
-		los-gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
-		mod-def0-gpio = <&gpio0 25 GPIO_ACTIVE_LOW>;
-		tx-disable-gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+		los-gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+		mod-def0-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
+		tx-disable-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
 	};
 
 	gpio-keys {
diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi
index 3c1771903191..093b7646d42e 100644
--- a/arch/arm/boot/dts/armada-388-clearfog.dtsi
+++ b/arch/arm/boot/dts/armada-388-clearfog.dtsi
@@ -80,10 +80,10 @@ pcie@2,0 {
 	sfp: sfp {
 		compatible = "sff,sfp";
 		i2c-bus = <&i2c1>;
-		los-gpio = <&expander0 12 GPIO_ACTIVE_HIGH>;
-		mod-def0-gpio = <&expander0 15 GPIO_ACTIVE_LOW>;
-		tx-disable-gpio = <&expander0 14 GPIO_ACTIVE_HIGH>;
-		tx-fault-gpio = <&expander0 13 GPIO_ACTIVE_HIGH>;
+		los-gpios = <&expander0 12 GPIO_ACTIVE_HIGH>;
+		mod-def0-gpios = <&expander0 15 GPIO_ACTIVE_LOW>;
+		tx-disable-gpios = <&expander0 14 GPIO_ACTIVE_HIGH>;
+		tx-fault-gpios = <&expander0 13 GPIO_ACTIVE_HIGH>;
 		maximum-power-milliwatt = <2000>;
 	};
 };
diff --git a/arch/arm/boot/dts/vf610-zii-cfu1.dts b/arch/arm/boot/dts/vf610-zii-cfu1.dts
index 96495d965163..67f1f35a5e40 100644
--- a/arch/arm/boot/dts/vf610-zii-cfu1.dts
+++ b/arch/arm/boot/dts/vf610-zii-cfu1.dts
@@ -68,8 +68,8 @@ sff: sfp {
 		pinctrl-0 = <&pinctrl_optical>;
 		pinctrl-names = "default";
 		i2c-bus = <&i2c0>;
-		los-gpio = <&gpio4 4 GPIO_ACTIVE_HIGH>;
-		tx-disable-gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+		los-gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>;
+		tx-disable-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
 	};
 
 	supply-voltage-monitor {
-- 
2.30.2

Re: [PATCH] arm: dts: update arm sfp bindings to use -gpios

[Andrew Lunn]

On Tue, May 16, 2023 at 10:48:32AM +0100, Russell King (Oracle) wrote:
> It was decided that SFP should use the -gpios suffix rather than -gpio.
> Update various boards to follow this.
> 
> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> ---
>  arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi | 6 +++---
>  arch/arm/boot/dts/armada-388-clearfog.dtsi     | 8 ++++----
>  arch/arm/boot/dts/vf610-zii-cfu1.dts           | 4 ++--
>  3 files changed, 9 insertions(+), 9 deletions(-)

Hi Russell

We probably want two patches, since there are two Maintainers
involved.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew