Skip to contentSkip to conversation

i2c: i2c-gpio: Correctly handle new {sda, scl}-gpios bindings

PATCH In review Chris Packham 3 participants 5 messages Jul 25, 2023 – Aug 7, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 i2c: i2c-gpio: Correctly handle new {sda, scl}-gpios bindings

gpio_request_list_by_name() returns the number of gpios requested. Notably it swallows the underlying -ENOENT when the "gpios" property does not exist.

Update the i2c-gpio driver to check for ret == 0 before trying the new sda-gpios/scl-gpios properties.

---
This was originally sent as a single patch[1]. I've rolled it into this series as the board change is dependent on it.

[1] - https://lore.kernel.org/u-boot/[email protected]/

(no changes since v1)

 drivers/i2c/i2c-gpio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/i2c-gpio.c +1 -1
index 4ed9e9e7cddd..c1fc290bd253 100644
@@ -339,7 +339,7 @@ static int i2c_gpio_of_to_plat(struct udevice *dev)
 	/* "gpios" is deprecated and replaced by "sda-gpios" + "scl-gpios". */
 	ret = gpio_request_list_by_name(dev, "gpios", bus->gpios,
 					ARRAY_SIZE(bus->gpios), 0);
-	if (ret == -ENOENT) {
+	if (ret == 0) {
 		ret = gpio_request_by_name(dev, "sda-gpios", 0,
 					   &bus->gpios[PIN_SDA], 0);
 		if (ret < 0)
Signature · 1 line
2.41.0
#1 lore raw

PATCH v2 2/2 arm: mvebu: x240: Use i2c-gpio instead of built in controller

There is an Errata with the built-in I2C controller where various I2C hardware errors cause a complete lockup of the CPU (which eventually results in an watchdog reset).

Put the I2C MPP pins into GPIO mode and use the i2c-gpio driver instead. This uses a bit-banged implementation of an I2C controller and avoids triggering the Errata.

---

Changes in v2:
- Update i2c0 alias
- Move i2c-gpio definition to root of device tree
- Remove &i2c0 instead of just disabling it
- Add r-by from Stefan

 arch/arm/dts/ac5-98dx35xx-atl-x240.dts | 30 ++++++++++++++++++++------
 configs/x240_defconfig                 |  1 +
 2 files changed, 24 insertions(+), 7 deletions(-)
arch/arm/dts/ac5-98dx35xx-atl-x240.dts +23 -7
index 820ec18b4355..c19b25925ba2 100644
@@ -16,7 +16,7 @@
 		gpio0 = &gpio0;
 		gpio1 = &gpio1;
 		spi0 = &spi0;
-		i2c0 = &i2c0;
+		i2c0 = &i2cgpio;
 		usb0 = &usb0;
 		pinctrl0 = &pinctrl0;
 	};
@@ -40,6 +40,19 @@
 			default-state = "on";
 		};
 	};
+
+	i2cgpio: i2c-gpio-0 {
+			compatible = "i2c-gpio";
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			pinctrl-names = "default";
+			pinctrl-0 =  <&i2c0_gpio>;
+			scl-gpios = <&gpio0 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+			sda-gpios = <&gpio0 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+			i2c-gpio,delay-us = <2>;
+			status = "okay";
+		 };
 };
 
 &nand {
@@ -70,9 +83,7 @@
 	status = "okay";
 };
 
-&i2c0 {
-	status = "okay";
-
+&i2cgpio {
 	mux@71 {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -177,8 +188,8 @@
 	 * LED_OE_N              [23]
 	 * USB_PWR_FLT_N         [24]
 	 * SFP_INT_N             [25]
-	 * I2C0_SCL              [26]
-	 * I2C0_SDA              [27]
+	 * I2C0_SCL              [26] (GPIO)
+	 * I2C0_SDA              [27] (GPIO)
 	 * USB_EN                [28]
 	 * MONITOR_INT_N         [29]
 	 * XM1_MDC               [30]
@@ -201,7 +212,7 @@
 	/*	     0    1    2    3    4    5    6    7    8    9 */
 	pin-func = < 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
 		     0xff 0xff 1    1    1    1    0xff 0xff 0    0
-		     0    0    0    0    0    0    1    1    0    0
+		     0    0    0    0    0    0    0xff 0xff 0    0
 		     1    1    1    1    0    0    0    0    0    0
 		     0    0    0    1    1    1    >;
 
@@ -209,4 +220,9 @@
 		marvell,pins = <0 1 2 3 4 5 6 7 8 9 10 11 16 17>;
 		marvell,function = <2>;
 	};
+
+	i2c0_gpio: i2c0-gpio-pins {
+		marvell,pins = <26 27>;
+		marvell,function = <0>;
+	};
 };
configs/x240_defconfig +1 -0
index a78cb3ce6cbf..7d2b8603e6f4 100644
@@ -42,6 +42,7 @@ CONFIG_CLK_MVEBU=y
 CONFIG_GPIO_HOG=y
 CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y
+CONFIG_DM_I2C_GPIO=y
 CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
Signature · 1 line
2.41.0
#2 lore raw

Re: [PATCH v2 2/2] arm: mvebu: x240: Use i2c-gpio instead of built in controller

Quoted 10 lines · Chris Packham

There is an Errata with the built-in I2C controller where various I2C hardware errors cause a complete lockup of the CPU (which eventually results in an watchdog reset).

Put the I2C MPP pins into GPIO mode and use the i2c-gpio driver instead. This uses a bit-banged implementation of an I2C controller and avoids triggering the Errata.

Applied to u-boot-marvell/master

Thanks,
Stefan

Quoted 91 lines

---

Changes in v2:
- Update i2c0 alias
- Move i2c-gpio definition to root of device tree
- Remove &i2c0 instead of just disabling it
- Add r-by from Stefan

  arch/arm/dts/ac5-98dx35xx-atl-x240.dts | 30 ++++++++++++++++++++------
  configs/x240_defconfig                 |  1 +
  2 files changed, 24 insertions(+), 7 deletions(-)
arch/arm/dts/ac5-98dx35xx-atl-x240.dts +23 -7
index 820ec18b4355..c19b25925ba2 100644
@@ -16,7 +16,7 @@
  		gpio0 = &gpio0;
  		gpio1 = &gpio1;
  		spi0 = &spi0;
-		i2c0 = &i2c0;
+		i2c0 = &i2cgpio;
  		usb0 = &usb0;
  		pinctrl0 = &pinctrl0;
  	};
@@ -40,6 +40,19 @@
  			default-state = "on";
  		};
  	};
+
+	i2cgpio: i2c-gpio-0 {
+			compatible = "i2c-gpio";
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			pinctrl-names = "default";
+			pinctrl-0 =  <&i2c0_gpio>;
+			scl-gpios = <&gpio0 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+			sda-gpios = <&gpio0 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+			i2c-gpio,delay-us = <2>;
+			status = "okay";
+		 };
  };
 
  &nand {
@@ -70,9 +83,7 @@
  	status = "okay";
  };
 
-&i2c0 {
-	status = "okay";
-
+&i2cgpio {
  	mux@71 {
  		#address-cells = <1>;
  		#size-cells = <0>;
@@ -177,8 +188,8 @@
  	 * LED_OE_N              [23]
  	 * USB_PWR_FLT_N         [24]
  	 * SFP_INT_N             [25]
-	 * I2C0_SCL              [26]
-	 * I2C0_SDA              [27]
+	 * I2C0_SCL              [26] (GPIO)
+	 * I2C0_SDA              [27] (GPIO)
  	 * USB_EN                [28]
  	 * MONITOR_INT_N         [29]
  	 * XM1_MDC               [30]
@@ -201,7 +212,7 @@
  	/*	     0    1    2    3    4    5    6    7    8    9 */
  	pin-func = < 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
  		     0xff 0xff 1    1    1    1    0xff 0xff 0    0
-		     0    0    0    0    0    0    1    1    0    0
+		     0    0    0    0    0    0    0xff 0xff 0    0
  		     1    1    1    1    0    0    0    0    0    0
  		     0    0    0    1    1    1    >;
 
@@ -209,4 +220,9 @@
  		marvell,pins = <0 1 2 3 4 5 6 7 8 9 10 11 16 17>;
  		marvell,function = <2>;
  	};
+
+	i2c0_gpio: i2c0-gpio-pins {
+		marvell,pins = <26 27>;
+		marvell,function = <0>;
+	};
  };
configs/x240_defconfig +0 -0
index a78cb3ce6cbf..7d2b8603e6f4 100644

configs/x240_defconfig CONFIG_CLK_MVEBU=y · line 48

Quoted 7 lines
configs/x240_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_CLK_MVEBU=y
  CONFIG_GPIO_HOG=y
  CONFIG_DM_PCA953X=y
  CONFIG_DM_I2C=y
+CONFIG_DM_I2C_GPIO=y
  CONFIG_SYS_I2C_MVTWSI=y
  CONFIG_I2C_MUX=y
  CONFIG_I2C_MUX_PCA954x=y

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
#3 lore raw
In reply to Chris Packham
Quoted 8 lines · Chris Packham

gpio_request_list_by_name() returns the number of gpios requested. Notably it swallows the underlying -ENOENT when the "gpios" property does not exist.

Update the i2c-gpio driver to check for ret == 0 before trying the new sda-gpios/scl-gpios properties.

Applied to u-boot-marvell/master

Thanks,
Stefan

Quoted 16 lines

---
This was originally sent as a single patch[1]. I've rolled it into this series as the board change is dependent on it.

[1] - https://lore.kernel.org/u-boot/[email protected]/

(no changes since v1)

  drivers/i2c/i2c-gpio.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/i2c-gpio.c +0 -0
index 4ed9e9e7cddd..c1fc290bd253 100644

drivers/i2c/i2c-gpio.c static int i2c_gpio_of_to_plat(struct udevice *dev) · line 345

Quoted 8 lines
drivers/i2c/i2c-gpio.c +1 -1
@@ -339,7 +339,7 @@ static int i2c_gpio_of_to_plat(struct udevice *dev)
  	/* "gpios" is deprecated and replaced by "sda-gpios" + "scl-gpios". */
  	ret = gpio_request_list_by_name(dev, "gpios", bus->gpios,
  					ARRAY_SIZE(bus->gpios), 0);
-	if (ret == -ENOENT) {
+	if (ret == 0) {
  		ret = gpio_request_by_name(dev, "sda-gpios", 0,
  					   &bus->gpios[PIN_SDA], 0);
  		if (ret < 0)

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Reviewed-by on v2 1/2
#4 lore raw

Re: [PATCH v2 1/2] i2c: i2c-gpio: Correctly handle new {sda,scl}-gpios bindings

In reply to Chris Packham

Hello Chris,

Quoted 12 lines · Chris Packham

gpio_request_list_by_name() returns the number of gpios requested. Notably it swallows the underlying -ENOENT when the "gpios" property does not exist.

Update the i2c-gpio driver to check for ret == 0 before trying the new sda-gpios/scl-gpios properties.

---
This was originally sent as a single patch[1]. I've rolled it into this series as the board change is dependent on it.

Quoted 6 lines

[1] - https://lore.kernel.org/u-boot/[email protected]/

(no changes since v1)

 drivers/i2c/i2c-gpio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: [email protected]