Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Yunus Bas <y.bas@phytec.de>
To:     robh+dt@kernel.org, shawnguo@kernel.org, festevam@gmail.com,
        devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     s.hauer@pengutronix.de, kernel@pengutronix.de,
        linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: dts: imx6: phytec: Add gpio pinctrl for i2c bus recovery
Date:   Mon, 4 Oct 2021 08:48:22 +0200
Message-Id: <20211004064822.97170-1-y.bas@phytec.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Make use of the i2c bus recovery feature and enable it on PHYTEC
phyCORE-based modules and boards.

Signed-off-by: Yunus Bas <y.bas@phytec.de>
---
 arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi    | 30 +++++++++++++++----
 .../boot/dts/imx6qdl-phytec-phycore-som.dtsi  | 12 +++++++-
 .../boot/dts/imx6ul-phytec-phycore-som.dtsi   | 12 +++++++-
 3 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi b/arch/arm/boot/dts=
/imx6qdl-phytec-mira.dtsi
index 0873f53ea275..120d6e997a4c 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi
@@ -145,8 +145,11 @@ &hdmi {
 };
=20
 &i2c1 {
-	pinctrl-names =3D "default";
+	pinctrl-names =3D "default", "gpio";
 	pinctrl-0 =3D <&pinctrl=5Fi2c1>;
+	pinctrl-1 =3D <&pinctrl=5Fi2c1=5Fgpio>;
+	scl-gpios =3D <&gpio3 21 (GPIO=5FACTIVE=5FHIGH | GPIO=5FOPEN=5FDRAIN)>;
+	sda-gpios =3D <&gpio3 28 (GPIO=5FACTIVE=5FHIGH | GPIO=5FOPEN=5FDRAIN)>;
 	clock-frequency =3D <400000>;
 	status =3D "disabled";
=20
@@ -185,8 +188,11 @@ i2c=5Frtc: rtc@68 {
 };
=20
 &i2c2 {
-	pinctrl-names =3D "default";
+	pinctrl-names =3D "default", "gpio";
 	pinctrl-0 =3D <&pinctrl=5Fi2c2>;
+	pinctrl-1 =3D <&pinctrl=5Fi2c2=5Fgpio>;
+	scl-gpios =3D <&gpio4 12 (GPIO=5FACTIVE=5FHIGH | GPIO=5FOPEN=5FDRAIN)>;
+	sda-gpios =3D <&gpio4 13 (GPIO=5FACTIVE=5FHIGH | GPIO=5FOPEN=5FDRAIN)>;
 	clock-frequency =3D <100000>;
 	status =3D "disabled";
 };
@@ -300,6 +306,20 @@ MX6QDL=5FPAD=5FKEY=5FROW2=5F=5FHDMI=5FTX=5FCEC=5FLINE	=
0x1f8b0
 		>;
 	};
=20
+	pinctrl=5Fi2c1: i2c1grp {
+		fsl,pins =3D <
+			MX6QDL=5FPAD=5FEIM=5FD21=5F=5FI2C1=5FSCL		0x4001b8b1
+			MX6QDL=5FPAD=5FEIM=5FD28=5F=5FI2C1=5FSDA		0x4001b8b1
+		>;
+	};
+
+	pinctrl=5Fi2c1=5Fgpio: i2c1gpiogrp {
+		fsl,pins =3D <
+			MX6QDL=5FPAD=5FEIM=5FD21=5F=5FGPIO3=5FIO21		0x4001b8b1
+			MX6QDL=5FPAD=5FEIM=5FD28=5F=5FGPIO3=5FIO28		0x4001b8b1
+		>;
+	};
+
 	pinctrl=5Fi2c2: i2c2grp {
 		fsl,pins =3D <
 			MX6QDL=5FPAD=5FKEY=5FROW3=5F=5FI2C2=5FSDA		0x4001b8b1
@@ -307,10 +327,10 @@ MX6QDL=5FPAD=5FKEY=5FCOL3=5F=5FI2C2=5FSCL		0x4001b8b1
 		>;
 	};
=20
-	pinctrl=5Fi2c1: i2c1grp {
+	pinctrl=5Fi2c2=5Fgpio: i2c2gpiogrp {
 		fsl,pins =3D <
-			MX6QDL=5FPAD=5FEIM=5FD21=5F=5FI2C1=5FSCL		0x4001b8b1
-			MX6QDL=5FPAD=5FEIM=5FD28=5F=5FI2C1=5FSDA		0x4001b8b1
+			MX6QDL=5FPAD=5FKEY=5FROW3=5F=5FGPIO4=5FIO13		0x4001b8b1
+			MX6QDL=5FPAD=5FKEY=5FCOL3=5F=5FGPIO4=5FIO12		0x4001b8b1
 		>;
 	};
=20
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/b=
oot/dts/imx6qdl-phytec-phycore-som.dtsi
index a80aa08a37cb..94b254bfd054 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi
@@ -78,8 +78,11 @@ &gpmi {
 };
=20
 &i2c3 {
-	pinctrl-names =3D "default";
+	pinctrl-names =3D "default", "gpio";
 	pinctrl-0 =3D <&pinctrl=5Fi2c3>;
+	pinctrl-1 =3D <&pinctrl=5Fi2c3=5Fgpio>;
+	scl-gpios =3D <&gpio1 5 (GPIO=5FACTIVE=5FHIGH | GPIO=5FOPEN=5FDRAIN)>;
+	sda-gpios =3D <&gpio1 6 (GPIO=5FACTIVE=5FHIGH | GPIO=5FOPEN=5FDRAIN)>;
 	clock-frequency =3D <400000>;
 	status =3D "okay";
=20
@@ -259,6 +262,13 @@ MX6QDL=5FPAD=5FGPIO=5F5=5F=5FI2C3=5FSCL		0x4001b8b1
 		>;
 	};
=20
+	pinctrl=5Fi2c3=5Fgpio: i2c3gpiogrp {
+		fsl,pins =3D <
+			MX6QDL=5FPAD=5FGPIO=5F6=5F=5FGPIO1=5FIO06	0x4001b8b1
+			MX6QDL=5FPAD=5FGPIO=5F5=5F=5FGPIO1=5FIO05	0x4001b8b1
+		>;
+	};
+
 	pinctrl=5Fecspi1: ecspi1grp {
 		fsl,pins =3D <
 			MX6QDL=5FPAD=5FEIM=5FD16=5F=5FECSPI1=5FSCLK		0x100b1
diff --git a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi b/arch/arm/bo=
ot/dts/imx6ul-phytec-phycore-som.dtsi
index 19a062635ff6..3cddc68917a0 100644
--- a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi
@@ -68,8 +68,11 @@ &gpmi {
 };
=20
 &i2c1 {
-	pinctrl-names =3D "default";
+	pinctrl-names =3D "default", "gpio";
 	pinctrl-0 =3D <&pinctrl=5Fi2c1>;
+	pinctrl-1 =3D <&pinctrl=5Fi2c1=5Fgpio>;
+	scl-gpios =3D <&gpio1 28 (GPIO=5FACTIVE=5FHIGH | GPIO=5FOPEN=5FDRAIN)>;
+	sda-gpios =3D <&gpio1 29 (GPIO=5FACTIVE=5FHIGH | GPIO=5FOPEN=5FDRAIN)>;
 	clock-frequency =3D <100000>;
 	status =3D "okay";
=20
@@ -147,6 +150,13 @@ MX6UL=5FPAD=5FUART4=5FRX=5FDATA=5F=5FI2C1=5FSDA	0x4001=
b8b0
 		>;
 	};
=20
+	pinctrl=5Fi2c1=5Fgpio: i2cgpiogrp {
+		fsl,pins =3D <
+			MX6UL=5FPAD=5FUART4=5FTX=5FDATA=5F=5FGPIO1=5FIO28	0x4001b8b0
+			MX6UL=5FPAD=5FUART4=5FRX=5FDATA=5F=5FGPIO1=5FIO29	0x4001b8b0
+		>;
+	};
+
 	pinctrl=5Fuart1: uart1grp {
 		fsl,pins =3D <
 			MX6UL=5FPAD=5FUART1=5FTX=5FDATA=5F=5FUART1=5FDCE=5FTX	0x1b0b1
--=20
2.33.0