Chris Packham <chris.packham@xxxxxxxxxxxxxxxxxxx> writes:
> 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@xxxxxxxxxxxxxxxxxxx>
Applied on mvebu/dt64
Thanks,
Gregory
> ---
> arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
> index 80b44c7df56a..881bf948d1df 100644
> --- a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
> +++ b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
> @@ -117,8 +117,8 @@ i2c0: i2c@11000{
> 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";
> };
>
> @@ -136,8 +136,8 @@ i2c1: i2c@11100{
> 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";
> };
>
> --
> 2.37.2
>
--
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com
