]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
arm64: dts: marvell: 98dx25xx: use correct property for i2c gpios
authorChris Packham <chris.packham@alliedtelesis.co.nz>
Thu, 1 Sep 2022 02:28:08 +0000 (14:28 +1200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Oct 2022 10:38:34 +0000 (12:38 +0200)
[ Upstream commit 2b14d382ec97ca5b420239ee6e16da390fab476c ]

Use the correct names for scl-gpios and sda-gpios so that the generic
i2c recovery code will find them. While we're here set the
GPIO_OPEN_DRAIN flag on the gpios.

Fixes: b795fadfc46b ("arm64: dts: marvell: Add Armada 98DX2530 SoC and RD-AC5X board")
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi

index 80b44c7df56aad6ca4caeb597a7b12d54f1d2e54..881bf948d1dff558d10f35956f41e108b2a3beeb 100644 (file)
                                pinctrl-names = "default", "gpio";
                                pinctrl-0 = <&i2c0_pins>;
                                pinctrl-1 = <&i2c0_gpio>;
-                               scl_gpio = <&gpio0 26 GPIO_ACTIVE_HIGH>;
-                               sda_gpio = <&gpio0 27 GPIO_ACTIVE_HIGH>;
+                               scl-gpios = <&gpio0 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                               sda-gpios = <&gpio0 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                                status = "disabled";
                        };
 
                                pinctrl-names = "default", "gpio";
                                pinctrl-0 = <&i2c1_pins>;
                                pinctrl-1 = <&i2c1_gpio>;
-                               scl_gpio = <&gpio0 20 GPIO_ACTIVE_HIGH>;
-                               sda_gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>;
+                               scl-gpios = <&gpio0 20 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                               sda-gpios = <&gpio0 21 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                                status = "disabled";
                        };