diff options
| author | Tom Rini | 2023-08-01 10:17:23 -0400 |
|---|---|---|
| committer | Tom Rini | 2023-08-01 10:17:23 -0400 |
| commit | aaeaef253619d06bfac32ff7faabaf16728f55e8 (patch) | |
| tree | 9c9a09837432cac643f7cf123f08674627684b28 | |
| parent | 4e619e8d4fd68095bc665a78f2651d8e478a4534 (diff) | |
| parent | 5c1c6b7306f2b4c0fd50c7cb5d757e245b93606e (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- i2c-gpio: Correctly handle new {sda, scl}-gpios bindings (Chris)
- mvebu: x240: Use i2c-gpio instead of built in controller (Chris)
| -rw-r--r-- | arch/arm/dts/ac5-98dx35xx-atl-x240.dts | 30 | ||||
| -rw-r--r-- | configs/x240_defconfig | 1 | ||||
| -rw-r--r-- | drivers/i2c/i2c-gpio.c | 2 |
3 files changed, 25 insertions, 8 deletions
diff --git a/arch/arm/dts/ac5-98dx35xx-atl-x240.dts b/arch/arm/dts/ac5-98dx35xx-atl-x240.dts index 820ec18b435..c19b25925ba 100644 --- a/arch/arm/dts/ac5-98dx35xx-atl-x240.dts +++ b/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>; + }; }; diff --git a/configs/x240_defconfig b/configs/x240_defconfig index a78cb3ce6cb..7d2b8603e6f 100644 --- a/configs/x240_defconfig +++ b/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 diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c index 4ed9e9e7cdd..c1fc290bd25 100644 --- a/drivers/i2c/i2c-gpio.c +++ b/drivers/i2c/i2c-gpio.c @@ -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) |