mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-18 21:21:26 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "arm: mvebu: x240: Use i2c-gpio instead of built in controller"

Browse Source 
This reverts commit 5c1c6b7306f2b4c0fd50c7cb5d757e245b93606e. The reason
for switching to i2c-gpio was due to an issue we were seeing in the
Linux kernel where the CPU would lock up on certain adverse I2C bus
conditions. We were never able to reproduce the lockup in U-Boot but
assumed that was probably just luck.

Since then we have discovered that the lock up was due to the I2C
transaction offload engine in the I2C controller not coping with the
adverse bus conditions (basically it thinks there's another master and
waits for a STOP condition that never comes). U-Boot doesn't use the I2C
offload feature so is not susceptible to the lockup.

We can therefore safely return to using the built-in I2C controller.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Chris Packham 2023-10-03 16:57:39 +13:00 committed by Stefan Roese
parent 5779da5313
commit 10c937fa23
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
arch/arm/dts/ac5-98dx35xx-atl-x240.dts
View File

@ -16,7 +16,7 @@
gpio0 = &gpio0; gpio0 = &gpio0;
gpio1 = &gpio1; gpio1 = &gpio1;
spi0 = &spi0; spi0 = &spi0;
i2c0 = &i2cgpio; i2c0 = &i2c0;
usb0 = &usb0; usb0 = &usb0;
pinctrl0 = &pinctrl0; pinctrl0 = &pinctrl0;
}; };
@ -40,19 +40,6 @@
default-state = "on"; 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 { &nand {
@ -83,7 +70,9 @@
status = "okay"; status = "okay";
}; };
&i2cgpio { &i2c0 {
status = "okay";
mux@71 { mux@71 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@ -188,8 +177,8 @@
* LED_OE_N [23] * LED_OE_N [23]
* USB_PWR_FLT_N [24] * USB_PWR_FLT_N [24]
* SFP_INT_N [25] * SFP_INT_N [25]
* I2C0_SCL [26] (GPIO) * I2C0_SCL [26]
* I2C0_SDA [27] (GPIO) * I2C0_SDA [27]
* USB_EN [28] * USB_EN [28]
* MONITOR_INT_N [29] * MONITOR_INT_N [29]
* XM1_MDC [30] * XM1_MDC [30]
@ -212,7 +201,7 @@
/* 0 1 2 3 4 5 6 7 8 9 */ /* 0 1 2 3 4 5 6 7 8 9 */
pin-func = < 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff pin-func = < 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
0xff 0xff 1 1 1 1 0xff 0xff 0 0 0xff 0xff 1 1 1 1 0xff 0xff 0 0
0 0 0 0 0 0 0xff 0xff 0 0 0 0 0 0 0 0 1 1 0 0
1 1 1 1 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0
0 0 0 1 1 1 >; 0 0 0 1 1 1 >;
@ -220,9 +209,4 @@
marvell,pins = <0 1 2 3 4 5 6 7 8 9 10 11 16 17>; marvell,pins = <0 1 2 3 4 5 6 7 8 9 10 11 16 17>;
marvell,function = <2>; marvell,function = <2>;
}; };
i2c0_gpio: i2c0-gpio-pins {
marvell,pins = <26 27>;
marvell,function = <0>;
};
}; };

1
configs/x240_defconfig
View File

@ -42,7 +42,6 @@ CONFIG_CLK_MVEBU=y
CONFIG_GPIO_HOG=y CONFIG_GPIO_HOG=y
CONFIG_DM_PCA953X=y CONFIG_DM_PCA953X=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_DM_I2C_GPIO=y
CONFIG_SYS_I2C_MVTWSI=y CONFIG_SYS_I2C_MVTWSI=y
CONFIG_I2C_MUX=y CONFIG_I2C_MUX=y
CONFIG_I2C_MUX_PCA954x=y CONFIG_I2C_MUX_PCA954x=y