From patchwork Tue May 16 09:48:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 13242847 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 18413C77B7A for ; Tue, 16 May 2023 09:51:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Date:Message-Id:MIME-Version:Subject:Cc :From:Reply-To:To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=JJcRnDGR/YjC6Lozf8J2YF9s57PSzkraoeSKEnYfm7g=; b=nMxquLbQQ53JaH TBoCYCqtGhuUB8j4gNr7FGL18GYUYuOG72w7XJvjh5npvKb7yMadZmESgPBmzQxn3klylzu4+ps+i nFImgBZF7GaANZ17iMeE3iEEnQDd8IoqaSnr4ZhTgepvX06q2YnpZM06WAUprjmsHdyXXoUH6Tfl6 VYui/1fgPT2QmM/Rsfgu7qMC0Qxt8Xx957FUQZsTcCLO7yV1xppnORkCWSmsJuj7iMBd02HU3MVGF rALm2NwaZahm3mpW89n9nRE4FE2ZpCyt58PgQk9OKjkKJIfDI4cp3iF3R9y3kS9Kz2Uh5ar+Iqchf /V1d+g+DAy3CyyRYBy/w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pyrKb-0058gc-1I; Tue, 16 May 2023 09:50:57 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyrKY-0058Fb-1X for linux-arm-kernel@lists.infradead.org; Tue, 16 May 2023 09:50:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:From:Reply-To:To:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=BJm5LPgKRep+P4ajkokBOa3xwg3UuUxrhzXpnK5oIc8=; b=MzIuHuesxXzdxKZWzK0Te6xJqT R96xAVOPuGzsYpzdeVRRjTbShbSACl/xijS8cdFBFKXzWmf6g5hB68+8UyrY784MY8Qt1Q6q4zmCQ B4e7gG/tB+jyOMLJj11AtpsYkRy4wNjSPLY9wR/LpdsAXI6/Une1K1m1XzI6c93CAqg/5L+c4PEEQ kWoCbJubCtJjINu4V/DM5csyHU8DPfmn0hrOeZfZO6FRrvSF8+jn9+MsIrgQElz+IqqsV6g9+vxt3 lYhvdyvVeAJa2RHjHOCSm2/1kaINRhQreRa8GK5GPaemhR/otr1x94Z1phstbY2bS2TrafiwIhkGo cjZyj7iQ==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:50074 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pyrIH-0005V5-Jb; Tue, 16 May 2023 10:48:33 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1pyrIG-005B4H-VG; Tue, 16 May 2023 10:48:33 +0100 From: "Russell King (Oracle)" Cc: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Stefan Agner , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH] arm: dts: update arm sfp bindings to use -gpios MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Tue, 16 May 2023 10:48:32 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230516_025054_518452_E2D43059 X-CRM114-Status: GOOD ( 10.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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) Reviewed-by: Andrew Lunn --- 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 {