mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-02 09:46:37 +03:00
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
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user