Merge tag 'i2c-updates-for-2026.10-rc1' of https://git.u-boot-project.org/u-boot/custodians/hs/u-boot-i2c

i2c updates for 2026.10-rc1

- i2c: designware: fix i2c probe error
  from Coben

  It would be good to have some Testers...

- i2c: nx_i2c: updates from Peng

  - Added License information
  - use dev_read_addr_ptr()

- cmd: kconfig: i2c: add missing I2C API dependency
  from Julien

3 files changed, 46 insertions, 8 deletions

diff --git a/cmd/Kconfig b/cmd/Kconfig
index ca1039f6a03..637119d3ff5 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1399,6 +1399,7 @@ config CMD_IOTRACE
 
 config CMD_I2C
 	bool "i2c"
+	depends on DM_I2C || SYS_I2C_LEGACY
 	help
 	  I2C support.
 
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index 8ad716f410e..8d290acefda 100644
--- a/drivers/i2c/designware_i2c.c
+++ b/drivers/i2c/designware_i2c.c
@@ -740,13 +740,47 @@ static int designware_i2c_probe_chip(struct udevice *bus, uint chip_addr,
 {
 	struct dw_i2c *i2c = dev_get_priv(bus);
 	struct i2c_regs *i2c_base = i2c->regs;
-	u32 tmp;
-	int ret;
+	u32 start_time, ic_status;
+	int ret = 0;
 
-	/* Try to read the first location of the chip */
-	ret = __dw_i2c_read(i2c_base, chip_addr, 0, 1, (uchar *)&tmp, 1);
+	ret = i2c_wait_for_bb(i2c_base);
 	if (ret)
-		__dw_i2c_init(i2c_base, 0, 0);
+		return ret;
+
+	dw_i2c_enable(i2c_base, false);
+	writel(chip_addr, &i2c_base->ic_tar);
+	dw_i2c_enable(i2c_base, true);
+
+	writel(IC_STOP, &i2c_base->ic_cmd_data);
+
+	start_time = get_timer(0);
+	while (1) {
+		ic_status = readl(&i2c_base->ic_status);
+
+		if ((ic_status & IC_STATUS_TFE) && !(ic_status & IC_STATUS_MA))
+			break;
+
+		if (readl(&i2c_base->ic_raw_intr_stat) & IC_TX_ABRT) {
+			readl(&i2c_base->ic_clr_tx_abrt);
+			ret = -EREMOTEIO;
+			break;
+		}
+
+		if (get_timer(start_time) > I2C_BYTE_TO) {
+			ret = -ETIMEDOUT;
+			break;
+		}
+	}
+
+	start_time = get_timer(0);
+	while (1) {
+		if ((readl(&i2c_base->ic_raw_intr_stat) & IC_STOP_DET)) {
+			readl(&i2c_base->ic_clr_stop_det);
+			break;
+		} else if (get_timer(start_time) > I2C_STOPDET_TO) {
+			break;
+		}
+	}
 
 	return ret;
 }
diff --git a/drivers/i2c/nx_i2c.c b/drivers/i2c/nx_i2c.c
index 706b7adefe8..5800e79ab70 100644
--- a/drivers/i2c/nx_i2c.c
+++ b/drivers/i2c/nx_i2c.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0+
+
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
@@ -230,12 +232,13 @@ static void i2c_process_node(struct udevice *dev)
 static int nx_i2c_probe(struct udevice *dev)
 {
 	struct nx_i2c_bus *bus = dev_get_priv(dev);
-	fdt_addr_t addr;
+	void __iomem *addr;
 
 	/* get regs = i2c base address */
-	addr = devfdt_get_addr(dev);
-	if (addr == FDT_ADDR_T_NONE)
+	addr = dev_read_addr_ptr(dev);
+	if (!addr)
 		return -EINVAL;
+
 	bus->regs = (struct nx_i2c_regs *)addr;
 
 	bus->bus_num = dev_seq(dev);