lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 437/862] arm64: dts: marvell: 98dx25xx: use correct property for i2c gpios
    Date
    From: Chris Packham <chris.packham@alliedtelesis.co.nz>

    [ 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 | 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 @@
    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 @@
    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.35.1


    \
     
     \ /
      Last update: 2022-10-19 15:48    [W:4.047 / U:0.812 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site