Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
From:   Chris Packham <chris.packham@alliedtelesis.co.nz>
To:     gregory.clement@bootlin.com, andi.shyti@kernel.org,
        robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org,
        conor+dt@kernel.org, pierre.gondois@arm.com
Cc:     linux-i2c@vger.kernel.org, devicetree@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Chris Packham <chris.packham@alliedtelesis.co.nz>
Subject: [PATCH v2 2/3] arm64: dts: marvell: AC5: use I2C unstuck function
Date:   Fri,  6 Oct 2023 13:33:20 +1300
Message-ID: <20231006003321.2100016-3-chris.packham@alliedtelesis.co.nz>
In-Reply-To: <20231006003321.2100016-1-chris.packham@alliedtelesis.co.nz>
References: <20231006003321.2100016-1-chris.packham@alliedtelesis.co.nz>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

The AC5 SoC supports using a controller based I2C unstuck function for
recovery. Use this instead of the generic GPIO recovery.

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
 arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi b/arch/arm64/b=
oot/dts/marvell/ac5-98dx25xx.dtsi
index c9ce1010c415..e52d3c3496d5 100644
--- a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
@@ -137,7 +137,7 @@ mdio: mdio@22004 {
=20
 			i2c0: i2c@11000{
 				compatible =3D "marvell,mv78230-i2c";
-				reg =3D <0x11000 0x20>;
+				reg =3D <0x11000 0x20>, <0x110a0 0x4>;
 				#address-cells =3D <1>;
 				#size-cells =3D <0>;
=20
@@ -146,17 +146,14 @@ i2c0: i2c@11000{
 				interrupts =3D <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
 				clock-frequency=3D<100000>;
=20
-				pinctrl-names =3D "default", "gpio";
+				pinctrl-names =3D "default";
 				pinctrl-0 =3D <&i2c0_pins>;
-				pinctrl-1 =3D <&i2c0_gpio>;
-				scl-gpios =3D <&gpio0 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-				sda-gpios =3D <&gpio0 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 				status =3D "disabled";
 			};
=20
 			i2c1: i2c@11100{
 				compatible =3D "marvell,mv78230-i2c";
-				reg =3D <0x11100 0x20>;
+				reg =3D <0x11100 0x20>, <0x110a4 0x4>;
 				#address-cells =3D <1>;
 				#size-cells =3D <0>;
=20
@@ -165,11 +162,8 @@ i2c1: i2c@11100{
 				interrupts =3D <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
 				clock-frequency=3D<100000>;
=20
-				pinctrl-names =3D "default", "gpio";
+				pinctrl-names =3D "default";
 				pinctrl-0 =3D <&i2c1_pins>;
-				pinctrl-1 =3D <&i2c1_gpio>;
-				scl-gpios =3D <&gpio0 20 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-				sda-gpios =3D <&gpio0 21 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 				status =3D "disabled";
 			};
=20
--=20
2.42.0