diff options
| author | Tom Rini <trini@konsulko.com> | 2023-08-01 17:17:23 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-01 17:17:23 +0300 |
| commit | aaeaef253619d06bfac32ff7faabaf16728f55e8 (patch) | |
| tree | 9c9a09837432cac643f7cf123f08674627684b28 /drivers | |
| parent | 4e619e8d4fd68095bc665a78f2651d8e478a4534 (diff) | |
| parent | 5c1c6b7306f2b4c0fd50c7cb5d757e245b93606e (diff) | |
| download | u-boot-aaeaef253619d06bfac32ff7faabaf16728f55e8.tar.xz | |
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)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/i2c-gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c index 4ed9e9e7cd..c1fc290bd2 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) |