Merge branch 'fix/i2c_stretch_probe' into 'master'

mythbuster5 · mythbuster5 · commit d5b052014c36 · 2025-03-28T10:36:22.000+08:00
fix(i2c_master): Fix the stretch happen cause timeout in probe

Closes IDFGH-14869

See merge request espressif/esp-idf!37975
diff --git a/components/esp_driver_i2c/i2c_master.c b/components/esp_driver_i2c/i2c_master.c
@@ -1285,6 +1285,8 @@ esp_err_t i2c_master_probe(i2c_master_bus_handle_t bus_handle, uint16_t address,
     }
     i2c_ll_master_set_fractional_divider(hal->dev, 0, 0);
     i2c_ll_enable_intr_mask(hal->dev, I2C_LL_MASTER_EVENT_INTR);
+    // 20ms is sufficient for stretch, since there is no device config on probe operation.
+    i2c_hal_master_set_scl_timeout_val(hal, 20 * 1000, bus_handle->base->clk_src_freq_hz);
     i2c_ll_update(hal->dev);
 
     s_i2c_send_commands(bus_handle, ticks_to_wait);

Original file line number	Diff line number	Diff line change
`@@ -1285,6 +1285,8 @@ esp_err_t i2c_master_probe(i2c_master_bus_handle_t bus_handle, uint16_t address,`
`1285`	`1285`	`}`
`1286`	`1286`	`i2c_ll_master_set_fractional_divider(hal->dev, 0, 0);`
`1287`	`1287`	`i2c_ll_enable_intr_mask(hal->dev, I2C_LL_MASTER_EVENT_INTR);`
	`1288`	`+ // 20ms is sufficient for stretch, since there is no device config on probe operation.`
	`1289`	`+ i2c_hal_master_set_scl_timeout_val(hal, 20 * 1000, bus_handle->base->clk_src_freq_hz);`
`1288`	`1290`	`i2c_ll_update(hal->dev);`
`1289`	`1291`
`1290`	`1292`	`s_i2c_send_commands(bus_handle, ticks_to_wait);`