diff options
| author | Tom Rini <[email protected]> | 2025-07-19 08:38:11 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-07-19 08:38:11 -0600 |
| commit | 7c85ee1f49405febac3fc6c745fa3d58a3e9bca7 (patch) | |
| tree | f92071b0a3800a73a8d28a7c66537a44bfd72ad8 /cmd | |
| parent | bd0ade7d090a334b3986936d63a34001d99722ad (diff) | |
| parent | 070c48fdb648716682cc7db8887856ce4d247a9a (diff) | |
Merge tag 'i2c-for-2025.10-take2' of https://source.denx.de/u-boot/custodians/u-boot-i2c
i2c updates for v2025.10
- i2c Kconfig updates from Tom
- add some driver dependencies
- added missing include delay.h in iproc_i2c.c
- i2c: muxes: Add PCA9541 i2c arbitrator driver
from Padmarao Begari
- pca954x: add pca9545 support
from Frank Wunderlich
- cmd: i2c: fix build when CFG_SYS_I2C_NOPROBES defined with DM_I2C
From Holger Brunck
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/i2c.c b/cmd/i2c.c index 7246c4fa3e7..f0aae93073f 100644 --- a/cmd/i2c.c +++ b/cmd/i2c.c @@ -917,9 +917,9 @@ static int do_i2c_probe(struct cmd_tbl *cmdtp, int flag, int argc, #endif /* NOPROBES */ int ret; #if CONFIG_IS_ENABLED(DM_I2C) - struct udevice *bus, *dev; + struct udevice *cur_bus, *dev; - if (i2c_get_cur_bus(&bus)) + if (i2c_get_cur_bus(&cur_bus)) return CMD_RET_FAILURE; #endif @@ -943,7 +943,7 @@ static int do_i2c_probe(struct cmd_tbl *cmdtp, int flag, int argc, continue; #endif #if CONFIG_IS_ENABLED(DM_I2C) - ret = dm_i2c_probe(bus, j, 0, &dev); + ret = dm_i2c_probe(cur_bus, j, 0, &dev); #else ret = i2c_probe(j); #endif |