瀏覽代碼

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.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Chris Packham 10 月之前
父節點
當前提交
5c1c6b7306
共有 2 個文件被更改,包括 24 次插入7 次删除
  1. 23 7
      arch/arm/dts/ac5-98dx35xx-atl-x240.dts
  2. 1 0
      configs/x240_defconfig

+ 23 - 7
arch/arm/dts/ac5-98dx35xx-atl-x240.dts

@@ -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>;
+	};
 };

+ 1 - 0
configs/x240_defconfig

@@ -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