diff --git a/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.h b/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.h
index 0ca05115204e8..ff6256eea6dae 100644
--- a/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.h
+++ b/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.h
@@ -41,6 +41,7 @@
 #define IGNORE_PIN_PA27     1
 #define IGNORE_PIN_PB00     1
 #define IGNORE_PIN_PB04     1
+#define IGNORE_PIN_PB05     1
 #define IGNORE_PIN_PB06     1
 #define IGNORE_PIN_PB07     1
 #define IGNORE_PIN_PB30     1
diff --git a/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
index 377e4f4f0f825..16af70ef683f9 100644
--- a/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
@@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY__EVE = 1
 CIRCUITPY_FLOPPYIO = 0
-CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_JPEGIO = 0
+CIRCUITPY_SYNTHIO = 0
 
 # We don't have room for the fonts for terminalio for certain languages,
 # so turn off terminalio, and if it's off and displayio is on,
diff --git a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
index ea38dc9d538be..d758d6878fb7f 100644
--- a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
@@ -10,4 +10,5 @@ SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ"
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_CODEOP = 0
 CIRCUITPY_RAINBOWIO = 0
diff --git a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.h b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.h
index c3074a5740d0b..b7ca7986ded89 100644
--- a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.h
+++ b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.h
@@ -48,3 +48,5 @@
 #define IGNORE_PIN_PB04     1
 #define IGNORE_PIN_PB05     1
 #define IGNORE_PIN_PB23     1
+#define IGNORE_PIN_PB30     1
+#define IGNORE_PIN_PB31     1
diff --git a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
index 4f01c141e4849..0567918884ac6 100644
--- a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
@@ -11,6 +11,7 @@ EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C, W25Q16JVxQ"
 LONGINT_IMPL = MPZ
 
 CIRCUITPY__EVE = 1
+CIRCUITPY_CODEOP = 0
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_JPEGIO = 0
 CIRCUITPY_SYNTHIO = 0
diff --git a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
index ef23e56022435..64049e8d5981c 100755
--- a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
@@ -10,4 +10,5 @@ SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32FV"
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_CODEOP = 0
 CIRCUITPY_RAINBOWIO = 0
diff --git a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.h b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.h
index bc157d6c86bb3..7eec1d64f8ef4 100644
--- a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.h
+++ b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.h
@@ -31,6 +31,43 @@
 #define DEFAULT_UART_BUS_RX (&pin_PA07)
 #define DEFAULT_UART_BUS_TX (&pin_PA06)
 
+#define IGNORE_PIN_PA03     1
+#define IGNORE_PIN_PA04     1
+#define IGNORE_PIN_PA12     1
+#define IGNORE_PIN_PA13     1
+#define IGNORE_PIN_PA14     1
+#define IGNORE_PIN_PA15     1
+#define IGNORE_PIN_PA18     1
+#define IGNORE_PIN_PA20     1
+#define IGNORE_PIN_PA21     1
+#define IGNORE_PIN_PA22     1
+#define IGNORE_PIN_PA23     1
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
+#define IGNORE_PIN_PA27     1
+#define IGNORE_PIN_PA28     1
+#define IGNORE_PIN_PA30     1
+#define IGNORE_PIN_PA31     1
+#define IGNORE_PIN_PB01     1
+#define IGNORE_PIN_PB02     1
+#define IGNORE_PIN_PB03     1
+#define IGNORE_PIN_PB04     1
+#define IGNORE_PIN_PB05     1
+#define IGNORE_PIN_PB06     1
+#define IGNORE_PIN_PB07     1
+#define IGNORE_PIN_PB08     1
+#define IGNORE_PIN_PB09     1
+#define IGNORE_PIN_PB10     1
+#define IGNORE_PIN_PB11     1
+#define IGNORE_PIN_PB12     1
+#define IGNORE_PIN_PB13     1
+#define IGNORE_PIN_PB14     1
+#define IGNORE_PIN_PB15     1
+#define IGNORE_PIN_PB16     1
+#define IGNORE_PIN_PB17     1
+#define IGNORE_PIN_PB22     1
+#define IGNORE_PIN_PB23     1
+#define IGNORE_PIN_PB30     1
+#define IGNORE_PIN_PB31     1
+#define IGNORE_PIN_PB00     1
diff --git a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
index 028114091ecb0..29b5865d419dd 100644
--- a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
@@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = W25Q32BV
 LONGINT_IMPL = MPZ
+
+CIRCUITPY_CODEOP = 0
diff --git a/ports/atmel-samd/common-hal/busio/I2C.c b/ports/atmel-samd/common-hal/busio/I2C.c
index 9c15848f568d2..e13b5410ae32a 100644
--- a/ports/atmel-samd/common-hal/busio/I2C.c
+++ b/ports/atmel-samd/common-hal/busio/I2C.c
@@ -53,7 +53,8 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     uint32_t sda_pinmux, scl_pinmux;
 
     // Ensure the object starts in its deinit state.
-    self->sda_pin = NO_PIN;
+    common_hal_busio_i2c_mark_deinit(self);
+
     Sercom *sercom = samd_i2c_get_sercom(scl, sda, &sercom_index, &sda_pinmux, &scl_pinmux);
     if (sercom == NULL) {
         raise_ValueError_invalid_pins();
@@ -108,21 +109,28 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
         mp_arg_error_invalid(MP_QSTR_frequency);
     }
 
+    if (i2c_m_sync_enable(&self->i2c_desc) != ERR_NONE) {
+        common_hal_busio_i2c_deinit(self);
+        mp_raise_OSError(MP_EIO);
+    }
+
     self->sda_pin = sda->number;
     self->scl_pin = scl->number;
     claim_pin(sda);
     claim_pin(scl);
 
-    if (i2c_m_sync_enable(&self->i2c_desc) != ERR_NONE) {
-        common_hal_busio_i2c_deinit(self);
-        mp_raise_OSError(MP_EIO);
-    }
+    // Prevent bulk sercom reset from resetting us. The finalizer will instead.
+    never_reset_sercom(self->i2c_desc.device.hw);
 }
 
 bool common_hal_busio_i2c_deinited(busio_i2c_obj_t *self) {
     return self->sda_pin == NO_PIN;
 }
 
+void common_hal_busio_i2c_mark_deinit(busio_i2c_obj_t *self) {
+    self->sda_pin = NO_PIN;
+}
+
 void common_hal_busio_i2c_deinit(busio_i2c_obj_t *self) {
     if (common_hal_busio_i2c_deinited(self)) {
         return;
@@ -133,8 +141,7 @@ void common_hal_busio_i2c_deinit(busio_i2c_obj_t *self) {
 
     reset_pin_number(self->sda_pin);
     reset_pin_number(self->scl_pin);
-    self->sda_pin = NO_PIN;
-    self->scl_pin = NO_PIN;
+    common_hal_busio_i2c_mark_deinit(self);
 }
 
 bool common_hal_busio_i2c_probe(busio_i2c_obj_t *self, uint8_t addr) {
@@ -236,8 +243,6 @@ uint8_t common_hal_busio_i2c_write_read(busio_i2c_obj_t *self, uint16_t addr,
 }
 
 void common_hal_busio_i2c_never_reset(busio_i2c_obj_t *self) {
-    never_reset_sercom(self->i2c_desc.device.hw);
-
     never_reset_pin_number(self->scl_pin);
     never_reset_pin_number(self->sda_pin);
 }
diff --git a/ports/broadcom/common-hal/busio/I2C.c b/ports/broadcom/common-hal/busio/I2C.c
index 29e7aa6713fa1..6a77cec08af83 100644
--- a/ports/broadcom/common-hal/busio/I2C.c
+++ b/ports/broadcom/common-hal/busio/I2C.c
@@ -47,9 +47,14 @@ void reset_i2c(void) {
 
 void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda, uint32_t frequency, uint32_t timeout) {
+
+    // Ensure the object starts in its deinit state.
+    common_hal_busio_i2c_mark_deinit(self);
+
     size_t instance_index = NUM_I2C;
     uint8_t scl_alt = 0;
     uint8_t sda_alt = 0;
+
     for (scl_alt = 0; scl_alt < 6; scl_alt++) {
         if (scl->functions[scl_alt].type != PIN_FUNCTION_I2C ||
             i2c_in_use[scl->functions[scl_alt].index] ||
@@ -90,17 +95,19 @@ bool common_hal_busio_i2c_deinited(busio_i2c_obj_t *self) {
     return self->sda_pin == NULL;
 }
 
+void common_hal_busio_i2c_mark_deinit(busio_i2c_obj_t *self) {
+    self->sda_pin = NULL;
+}
+
 void common_hal_busio_i2c_deinit(busio_i2c_obj_t *self) {
     if (common_hal_busio_i2c_deinited(self)) {
         return;
     }
-    never_reset_i2c[self->index] = false;
     i2c_in_use[self->index] = false;
 
     common_hal_reset_pin(self->sda_pin);
     common_hal_reset_pin(self->scl_pin);
-    self->sda_pin = NULL;
-    self->scl_pin = NULL;
+    common_hal_busio_i2c_mark_deinit(self);
 }
 
 bool common_hal_busio_i2c_probe(busio_i2c_obj_t *self, uint8_t addr) {
diff --git a/ports/cxd56/common-hal/busio/I2C.c b/ports/cxd56/common-hal/busio/I2C.c
index 20ee4ac0f84a1..fb33c242a0367 100644
--- a/ports/cxd56/common-hal/busio/I2C.c
+++ b/ports/cxd56/common-hal/busio/I2C.c
@@ -16,6 +16,10 @@
 
 void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, const mcu_pin_obj_t *scl,
     const mcu_pin_obj_t *sda, uint32_t frequency, uint32_t timeout) {
+
+    // Ensure the object starts in its deinit state.
+    common_hal_busio_i2c_mark_deinit(self);
+
     if (frequency != I2C_SPEED_STANDARD && frequency != I2C_SPEED_FAST) {
         mp_arg_error_invalid(MP_QSTR_frequency);
     }
@@ -44,12 +48,18 @@ void common_hal_busio_i2c_deinit(busio_i2c_obj_t *self) {
 
     reset_pin_number(self->scl_pin->number);
     reset_pin_number(self->sda_pin->number);
+
+    common_hal_busio_i2c_mark_deinit(self);
 }
 
 bool common_hal_busio_i2c_deinited(busio_i2c_obj_t *self) {
     return self->i2c_dev == NULL;
 }
 
+void common_hal_busio_i2c_mark_deinit(busio_i2c_obj_t *self) {
+    self->i2c_dev = NULL;
+}
+
 bool common_hal_busio_i2c_try_lock(busio_i2c_obj_t *self) {
     if (common_hal_busio_i2c_deinited(self)) {
         return false;
diff --git a/ports/espressif/CMakeLists.txt b/ports/espressif/CMakeLists.txt
index addcd36f17274..387a18dac094d 100644
--- a/ports/espressif/CMakeLists.txt
+++ b/ports/espressif/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.16)
 set(ENV{IDF_PATH} ${CMAKE_SOURCE_DIR}/esp-idf)
 
 # The component list here determines what options we get in menuconfig and what the ninja file can build.
-set(COMPONENTS bt driver esp_driver_dac esp_driver_gpio esp_driver_gptimer esp_driver_i2s esp_driver_ledc esp_driver_pcnt esp_driver_rmt esp_driver_spi esp_driver_tsens esp_driver_uart esp-tls esp_adc_cal esp_event esp_netif esp_psram esp_wifi esptool_py freertos log lwip main mbedtls mdns soc ulp usb wpa_supplicant esp-camera esp_lcd vfs esp_vfs_console sdmmc)
+set(COMPONENTS bt driver esp_driver_dac esp_driver_gpio esp_driver_gptimer esp_driver_i2c esp_driver_i2s esp_driver_ledc esp_driver_pcnt esp_driver_rmt esp_driver_spi esp_driver_tsens esp_driver_uart esp-tls esp_adc_cal esp_event esp_netif esp_psram esp_wifi esptool_py freertos log lwip main mbedtls mdns soc ulp usb wpa_supplicant esp-camera esp_lcd vfs esp_vfs_console sdmmc)
 set(EXTRA_COMPONENT_DIRS "esp-protocols/components/mdns" "esp-camera")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index c14c9cf438b81..ba522f099e85d 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -65,7 +65,6 @@ INC += \
 	-isystem esp-idf/components/bt/host/nimble/nimble/porting/nimble/include \
 	-isystem esp-idf/components/bt/host/nimble/nimble/porting/npl/freertos/include \
 	-isystem esp-idf/components/bt/host/nimble/port/include \
-	-isystem esp-idf/components/driver/i2c/include \
 	-isystem esp-idf/components/driver/touch_sensor/include \
 	-isystem esp-idf/components/driver/touch_sensor/$(IDF_TARGET)/include \
 	-isystem esp-idf/components/driver/twai/include \
@@ -396,7 +395,6 @@ SRC_C += \
 	boards/$(BOARD)/board.c \
 	boards/$(BOARD)/pins.c \
 	shared/netutils/netutils.c \
-	peripherals/i2c.c \
 	peripherals/$(IDF_TARGET)/pins.c
 
 ifeq ($(CIRCUITPY_SSL),1)
@@ -618,7 +616,7 @@ ifeq ($(IDF_TARGET),esp32)
 BINARY_BLOBS += esp-idf/components/esp_phy/lib/$(IDF_TARGET)/librtc.a
 endif
 
-ESP_IDF_COMPONENTS_LINK = $(IDF_TARGET_ARCH) $(CHIP_COMPONENTS) app_update bootloader_support driver esp_driver_gpio esp_driver_gptimer esp_driver_ledc esp_driver_spi esp_driver_uart efuse esp_adc esp_app_format esp_common esp_event esp_hw_support esp_mm esp_partition esp_pm esp_ringbuf esp_rom esp_system esp_timer freertos hal heap log newlib nvs_flash pthread soc spi_flash vfs esp_vfs_console
+ESP_IDF_COMPONENTS_LINK = $(IDF_TARGET_ARCH) $(CHIP_COMPONENTS) app_update bootloader_support driver esp_driver_gpio esp_driver_gptimer esp_driver_i2c esp_driver_ledc esp_driver_spi esp_driver_uart efuse esp_adc esp_app_format esp_common esp_event esp_hw_support esp_mm esp_partition esp_pm esp_ringbuf esp_rom esp_system esp_timer freertos hal heap log newlib nvs_flash pthread soc spi_flash vfs esp_vfs_console
 ifneq ($(CIRCUITPY_WIFI),0)
 	ESP_IDF_COMPONENTS_LINK += esp_coex esp_netif esp-tls esp_wifi lwip mbedtls mdns wpa_supplicant esp_phy
 endif
diff --git a/ports/espressif/boards/adafruit_esp32s3_camera/board.c b/ports/espressif/boards/adafruit_esp32s3_camera/board.c
index 027b7ca8b6e45..e0c357f04c80f 100644
--- a/ports/espressif/boards/adafruit_esp32s3_camera/board.c
+++ b/ports/espressif/boards/adafruit_esp32s3_camera/board.c
@@ -16,7 +16,6 @@
 
 #include "esp_log.h"
 #include "esp_err.h"
-#include "driver/i2c.h"
 
 
 #define DELAY 0x80
diff --git a/ports/espressif/boards/seeed_xiao_esp32_s3_sense/board.c b/ports/espressif/boards/seeed_xiao_esp32_s3_sense/board.c
index 6cc4f2e089ec2..fea7fe2c3002e 100644
--- a/ports/espressif/boards/seeed_xiao_esp32_s3_sense/board.c
+++ b/ports/espressif/boards/seeed_xiao_esp32_s3_sense/board.c
@@ -4,10 +4,6 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "supervisor/board.h"
 #include "mpconfigboard.h"
-#include "esp_log.h"
-#include "esp_err.h"
-#include "driver/i2c.h"
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/common-hal/busio/I2C.c b/ports/espressif/common-hal/busio/I2C.c
index 046d2ba2e233c..88dffb5d2c82a 100644
--- a/ports/espressif/common-hal/busio/I2C.c
+++ b/ports/espressif/common-hal/busio/I2C.c
@@ -10,11 +10,16 @@
 
 #include "components/driver/i2c/include/driver/i2c.h"
 
+#include "bindings/espidf/__init__.h"
 #include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
 void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
-    const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda, uint32_t frequency, uint32_t timeout) {
+    const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda, uint32_t frequency, uint32_t timeout_us) {
+
+    // Ensure the object starts in its deinit state.
+    common_hal_busio_i2c_mark_deinit(self);
+
     // Pins 45 and 46 are "strapping" pins that impact start up behavior. They usually need to
     // be pulled-down so pulling them up for I2C is a bad idea. To make this hard, we don't
     // support I2C on these pins.
@@ -60,45 +65,47 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     }
     #endif
 
+
+    i2c_master_bus_config_t config = {
+        .i2c_port = -1, // auto
+        .sda_io_num = sda->number,
+        .scl_io_num = scl->number,
+        .clk_source = I2C_CLK_SRC_DEFAULT,
+        .glitch_ignore_cnt = 7,
+        .flags = {
+            #if CIRCUITPY_I2C_ALLOW_INTERNAL_PULL_UP
+            .enable_internal_pullup = true, /*!< Internal GPIO pull mode for I2C sda signal*/
+            #else
+            .enable_internal_pullup = false, /*!< Internal GPIO pull mode for I2C sda signal*/
+            #endif
+        }
+    };
+    esp_err_t result = i2c_new_master_bus(&config, &self->handle);
+
+    if (result == ESP_ERR_NOT_FOUND) {
+        mp_raise_ValueError(MP_ERROR_TEXT("All I2C peripherals are in use"));
+    }
+    CHECK_ESP_RESULT(result);
+
     self->xSemaphore = xSemaphoreCreateMutex();
     if (self->xSemaphore == NULL) {
+        i2c_del_master_bus(self->handle);
+        self->handle = NULL;
         mp_raise_RuntimeError(MP_ERROR_TEXT("Unable to create lock"));
     }
     self->sda_pin = sda;
     self->scl_pin = scl;
-    self->i2c_num = peripherals_i2c_get_free_num();
-    self->has_lock = 0;
-
-    if (self->i2c_num == I2C_NUM_MAX) {
-        mp_raise_ValueError(MP_ERROR_TEXT("All I2C peripherals are in use"));
-    }
-
-    const i2c_config_t i2c_conf = {
-        .mode = I2C_MODE_MASTER,
-        .sda_io_num = self->sda_pin->number,
-        .scl_io_num = self->scl_pin->number,
-        #if CIRCUITPY_I2C_ALLOW_INTERNAL_PULL_UP
-        .sda_pullup_en = GPIO_PULLUP_ENABLE,  /*!< Internal GPIO pull mode for I2C sda signal*/
-        .scl_pullup_en = GPIO_PULLUP_ENABLE,  /*!< Internal GPIO pull mode for I2C scl signal*/
-        #else
-        .sda_pullup_en = GPIO_PULLUP_DISABLE,  /*!< Internal GPIO pull mode for I2C sda signal*/
-        .scl_pullup_en = GPIO_PULLUP_DISABLE,  /*!< Internal GPIO pull mode for I2C scl signal*/
-        #endif
-
-        .master = {
-            .clk_speed = frequency,
-        }
-    };
+    self->has_lock = false;
+    self->frequency = frequency;
 
-    // Initialize I2C.
-    esp_err_t err = peripherals_i2c_init(self->i2c_num, &i2c_conf);
-    if (err != ESP_OK) {
-        if (err == ESP_FAIL) {
-            mp_raise_OSError(MP_EIO);
-        } else {
-            mp_raise_RuntimeError(MP_ERROR_TEXT("init I2C"));
-        }
-    }
+    // Ignore the passed-in clock-stretching timeout. It is not used, as documented in shared-bindings.
+    // Instead use 1000 ms, which is standard across ports.
+    // self->timeout_ms = timeout_us / 1000;
+    // // Round up timeout to nearest ms.
+    // if (timeout_us % 1000 != 0) {
+    //     self->timeout_ms += 1;
+    // }
+    self->timeout_ms = 1000;
 
     claim_pin(sda);
     claim_pin(scl);
@@ -108,32 +115,25 @@ bool common_hal_busio_i2c_deinited(busio_i2c_obj_t *self) {
     return self->sda_pin == NULL;
 }
 
+void common_hal_busio_i2c_mark_deinit(busio_i2c_obj_t *self) {
+    self->sda_pin = NULL;
+}
+
 void common_hal_busio_i2c_deinit(busio_i2c_obj_t *self) {
     if (common_hal_busio_i2c_deinited(self)) {
         return;
     }
 
-    peripherals_i2c_deinit(self->i2c_num);
+    i2c_del_master_bus(self->handle);
+    self->handle = NULL;
 
     common_hal_reset_pin(self->sda_pin);
     common_hal_reset_pin(self->scl_pin);
-    self->sda_pin = NULL;
-    self->scl_pin = NULL;
-}
-
-static esp_err_t i2c_zero_length_write(busio_i2c_obj_t *self, uint8_t addr, TickType_t timeout) {
-    // i2c_master_write_to_device() won't do zero-length writes, so we do it by hand.
-    i2c_cmd_handle_t cmd = i2c_cmd_link_create();
-    i2c_master_start(cmd);
-    i2c_master_write_byte(cmd, addr << 1, true);
-    i2c_master_stop(cmd);
-    esp_err_t result = i2c_master_cmd_begin(self->i2c_num, cmd, timeout);
-    i2c_cmd_link_delete(cmd);
-    return result;
+    common_hal_busio_i2c_mark_deinit(self);
 }
 
 bool common_hal_busio_i2c_probe(busio_i2c_obj_t *self, uint8_t addr) {
-    esp_err_t result = i2c_zero_length_write(self, addr, pdMS_TO_TICKS(10));
+    esp_err_t result = i2c_master_probe(self->handle, addr, 10);
     return result == ESP_OK;
 }
 
@@ -170,28 +170,54 @@ static uint8_t convert_esp_err(esp_err_t result) {
     }
 }
 
+static size_t _transaction_duration_ms(size_t frequency, size_t len) {
+    size_t khz = frequency / 1000;
+    size_t bytes_per_ms = khz / 8;
+    // + 1 for the address byte
+    return (len + 1) / bytes_per_ms + 1000;
+}
+
 uint8_t common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr, const uint8_t *data, size_t len) {
-    return convert_esp_err(len == 0
-        ? i2c_zero_length_write(self, addr, pdMS_TO_TICKS(1000))
-        : i2c_master_write_to_device(self->i2c_num, (uint8_t)addr, data, len, pdMS_TO_TICKS(1000))
-        );
+    i2c_device_config_t dev_config = {
+        .dev_addr_length = I2C_ADDR_BIT_LEN_7,
+        .device_address = addr,
+        .scl_speed_hz = self->frequency
+    };
+    i2c_master_dev_handle_t dev_handle;
+    CHECK_ESP_RESULT(i2c_master_bus_add_device(self->handle, &dev_config, &dev_handle));
+    esp_err_t result = i2c_master_transmit(dev_handle, data, len, _transaction_duration_ms(self->frequency, len) + self->timeout_ms);
+    CHECK_ESP_RESULT(i2c_master_bus_rm_device(dev_handle));
+    return convert_esp_err(result);
 }
 
 uint8_t common_hal_busio_i2c_read(busio_i2c_obj_t *self, uint16_t addr, uint8_t *data, size_t len) {
-    return convert_esp_err(
-        i2c_master_read_from_device(self->i2c_num, (uint8_t)addr, data, len, pdMS_TO_TICKS(1000)));
+    i2c_device_config_t dev_config = {
+        .dev_addr_length = I2C_ADDR_BIT_LEN_7,
+        .device_address = addr,
+        .scl_speed_hz = self->frequency
+    };
+    i2c_master_dev_handle_t dev_handle;
+    CHECK_ESP_RESULT(i2c_master_bus_add_device(self->handle, &dev_config, &dev_handle));
+    esp_err_t result = i2c_master_receive(dev_handle, data, len, _transaction_duration_ms(self->frequency, len) + self->timeout_ms);
+    CHECK_ESP_RESULT(i2c_master_bus_rm_device(dev_handle));
+    return convert_esp_err(result);
 }
 
 uint8_t common_hal_busio_i2c_write_read(busio_i2c_obj_t *self, uint16_t addr,
     uint8_t *out_data, size_t out_len, uint8_t *in_data, size_t in_len) {
-    return convert_esp_err(
-        i2c_master_write_read_device(self->i2c_num, (uint8_t)addr,
-            out_data, out_len, in_data, in_len, pdMS_TO_TICKS(1000)));
+    i2c_device_config_t dev_config = {
+        .dev_addr_length = I2C_ADDR_BIT_LEN_7,
+        .device_address = addr,
+        .scl_speed_hz = self->frequency
+    };
+    i2c_master_dev_handle_t dev_handle;
+    CHECK_ESP_RESULT(i2c_master_bus_add_device(self->handle, &dev_config, &dev_handle));
+    esp_err_t result = i2c_master_transmit_receive(dev_handle, out_data, out_len, in_data, in_len, _transaction_duration_ms(self->frequency, out_len) + _transaction_duration_ms(self->frequency, in_len) + self->timeout_ms);
+    CHECK_ESP_RESULT(i2c_master_bus_rm_device(dev_handle));
+    return convert_esp_err(result);
 }
 
 void common_hal_busio_i2c_never_reset(busio_i2c_obj_t *self) {
-    never_reset_i2c(self->i2c_num);
-
     common_hal_never_reset_pin(self->scl_pin);
     common_hal_never_reset_pin(self->sda_pin);
 }
diff --git a/ports/espressif/common-hal/busio/I2C.h b/ports/espressif/common-hal/busio/I2C.h
index 6e040224ece20..25d9791f2521d 100644
--- a/ports/espressif/common-hal/busio/I2C.h
+++ b/ports/espressif/common-hal/busio/I2C.h
@@ -13,13 +13,15 @@
 #include "freertos/semphr.h"
 #include "py/obj.h"
 
-#include "peripherals/i2c.h"
+#include "driver/i2c_master.h"
 
 typedef struct {
     mp_obj_base_t base;
     const mcu_pin_obj_t *scl_pin;
     const mcu_pin_obj_t *sda_pin;
-    i2c_port_t i2c_num;
+    size_t timeout_ms;
+    size_t frequency;
+    i2c_master_bus_handle_t handle;
     SemaphoreHandle_t xSemaphore;
     bool has_lock;
 } busio_i2c_obj_t;
diff --git a/ports/espressif/common-hal/espcamera/Camera.c b/ports/espressif/common-hal/espcamera/Camera.c
index bcf4732fcd8b2..5b45a26951edc 100644
--- a/ports/espressif/common-hal/espcamera/Camera.c
+++ b/ports/espressif/common-hal/espcamera/Camera.c
@@ -77,13 +77,16 @@ void common_hal_espcamera_camera_construct(
 
     self->i2c = i2c;
 
-    self->camera_config.pin_pwdn = common_hal_mcu_pin_number(powerdown_pin);
-    self->camera_config.pin_reset = common_hal_mcu_pin_number(reset_pin);
-    self->camera_config.pin_xclk = common_hal_mcu_pin_number(external_clock_pin);
+    // These pins might be NULL because they were not specified.
+    // Note that common_hal_mcu_pin_number() returns NO_PIN (- =1) if pass NULL, but as a `uint8_t`,
+    // so it becomes 255. The camera driver expects non-specified pins to be < 0.
+    // So we have to set the pins to NO_PIN explicitly,
+    // instead of relying on the return value from common_hal_mcu_pin_number().
+    self->camera_config.pin_pwdn = powerdown_pin ? common_hal_mcu_pin_number(powerdown_pin) : NO_PIN;
+    self->camera_config.pin_reset = reset_pin ? common_hal_mcu_pin_number(reset_pin) : NO_PIN;
+    self->camera_config.pin_xclk = external_clock_pin ? common_hal_mcu_pin_number(external_clock_pin) : NO_PIN;
 
-    self->camera_config.pin_sccb_sda = NO_PIN;
-    self->camera_config.pin_sccb_scl = NO_PIN;
-    /* sccb i2c port set below */
+    self->camera_config.sccb_i2c_master_bus_handle = self->i2c->handle;
 
     self->camera_config.pin_d7 = data_pins[7];
     self->camera_config.pin_d6 = data_pins[6];
@@ -106,7 +109,7 @@ void common_hal_espcamera_camera_construct(
     self->camera_config.fb_count = framebuffer_count;
     self->camera_config.grab_mode = grab_mode;
 
-    self->camera_config.sccb_i2c_port = i2c->i2c_num;
+
 
     i2c_lock(self);
     esp_err_t result = esp_camera_init(&self->camera_config);
@@ -122,6 +125,7 @@ extern void common_hal_espcamera_camera_deinit(espcamera_camera_obj_t *self) {
 
     common_hal_pwmio_pwmout_deinit(&self->pwm);
 
+    // Does nothing if pin is NO_PIN (-1).
     reset_pin_number(self->camera_config.pin_pwdn);
     reset_pin_number(self->camera_config.pin_reset);
     reset_pin_number(self->camera_config.pin_xclk);
diff --git a/ports/espressif/esp-camera b/ports/espressif/esp-camera
index d529ebdffb841..243560e94997c 160000
--- a/ports/espressif/esp-camera
+++ b/ports/espressif/esp-camera
@@ -1 +1 @@
-Subproject commit d529ebdffb84131b1aadaec32a7373b319b70391
+Subproject commit 243560e94997c262565ed537154b0578b8ce2197
diff --git a/ports/espressif/peripherals/i2c.c b/ports/espressif/peripherals/i2c.c
deleted file mode 100644
index 744aa07f43d24..0000000000000
--- a/ports/espressif/peripherals/i2c.c
+++ /dev/null
@@ -1,65 +0,0 @@
-// This file is part of the CircuitPython project: https://circuitpython.org
-//
-// SPDX-FileCopyrightText: Copyright (c) 2020 microDev
-//
-// SPDX-License-Identifier: MIT
-
-#include "peripherals/i2c.h"
-
-typedef enum {
-    STATUS_FREE = 0,
-    STATUS_IN_USE,
-    STATUS_NEVER_RESET
-} i2c_status_t;
-
-static i2c_status_t i2c_status[I2C_NUM_MAX];
-
-void i2c_reset(void) {
-    for (i2c_port_t num = 0; num < (i2c_port_t)I2C_NUM_MAX; num++) {
-        if (i2c_status[num] == STATUS_IN_USE) {
-            i2c_driver_delete(num);
-            i2c_status[num] = STATUS_FREE;
-        }
-    }
-}
-
-void never_reset_i2c(i2c_port_t num) {
-    i2c_status[num] = STATUS_NEVER_RESET;
-}
-
-esp_err_t peripherals_i2c_init(i2c_port_t num, const i2c_config_t *i2c_conf) {
-    esp_err_t err = i2c_param_config(num, i2c_conf);
-    if (err != ESP_OK) {
-        return err;
-    }
-    size_t rx_buf_len = 0;
-    size_t tx_buf_len = 0;
-    #ifdef SOC_I2C_SUPPORT_SLAVE
-    if (i2c_conf->mode == I2C_MODE_SLAVE) {
-        rx_buf_len = 256;
-        tx_buf_len = 256;
-    }
-    #endif
-    return i2c_driver_install(num, i2c_conf->mode, rx_buf_len, tx_buf_len, 0);
-}
-
-void peripherals_i2c_deinit(i2c_port_t num) {
-    i2c_reset_rx_fifo(num);
-    i2c_reset_tx_fifo(num);
-    i2c_driver_delete(num);
-    i2c_status[num] = STATUS_FREE;
-}
-
-i2c_port_t peripherals_i2c_get_free_num(void) {
-    i2c_port_t i2c_num = I2C_NUM_MAX;
-    for (i2c_port_t num = 0; num < (int)I2C_NUM_MAX; num++) {
-        if (i2c_status[num] == STATUS_FREE) {
-            i2c_num = num;
-            break;
-        }
-    }
-    if (i2c_num != I2C_NUM_MAX) {
-        i2c_status[i2c_num] = STATUS_IN_USE;
-    }
-    return i2c_num;
-}
diff --git a/ports/espressif/peripherals/i2c.h b/ports/espressif/peripherals/i2c.h
deleted file mode 100644
index a97889fe5acfa..0000000000000
--- a/ports/espressif/peripherals/i2c.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// This file is part of the CircuitPython project: https://circuitpython.org
-//
-// SPDX-FileCopyrightText: Copyright (c) 2020 microDev
-//
-// SPDX-License-Identifier: MIT
-
-#pragma once
-
-#include "driver/i2c.h"
-
-extern void i2c_reset(void);
-extern void never_reset_i2c(i2c_port_t num);
-extern esp_err_t peripherals_i2c_init(i2c_port_t num, const i2c_config_t *i2c_conf);
-extern void peripherals_i2c_deinit(i2c_port_t num);
-extern i2c_port_t peripherals_i2c_get_free_num(void);
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index be80e419d660c..3be63db0f040a 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -24,7 +24,6 @@
 #include "bindings/espulp/__init__.h"
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/analogio/AnalogOut.h"
-#include "common-hal/busio/I2C.h"
 #include "common-hal/busio/SPI.h"
 #include "common-hal/busio/UART.h"
 #include "common-hal/dualbank/__init__.h"
@@ -347,7 +346,6 @@ void reset_port(void) {
     #endif
 
     #if CIRCUITPY_BUSIO
-    i2c_reset();
     spi_reset();
     uart_reset();
     #endif
diff --git a/ports/mimxrt10xx/common-hal/busio/I2C.c b/ports/mimxrt10xx/common-hal/busio/I2C.c
index fb45553d40038..132b3083212a1 100644
--- a/ports/mimxrt10xx/common-hal/busio/I2C.c
+++ b/ports/mimxrt10xx/common-hal/busio/I2C.c
@@ -27,16 +27,6 @@
 
 // arrays use 0 based numbering: I2C1 is stored at index 0
 static bool reserved_i2c[MP_ARRAY_SIZE(mcu_i2c_banks)];
-static bool never_reset_i2c[MP_ARRAY_SIZE(mcu_i2c_banks)];
-
-void i2c_reset(void) {
-    for (uint i = 0; i < MP_ARRAY_SIZE(mcu_i2c_banks); i++) {
-        if (!never_reset_i2c[i]) {
-            reserved_i2c[i] = false;
-            LPI2C_MasterDeinit(mcu_i2c_banks[i]);
-        }
-    }
-}
 
 static void config_periph_pin(const mcu_periph_obj_t *periph) {
     IOMUXC_SetPinMux(
@@ -76,6 +66,9 @@ static void i2c_check_pin_config(const mcu_pin_obj_t *pin, uint32_t pull) {
 void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda, uint32_t frequency, uint32_t timeout) {
 
+    // Ensure the object starts in its deinit state.
+    common_hal_busio_i2c_mark_deinit(self);
+
     #if CIRCUITPY_REQUIRE_I2C_PULLUPS
     // Test that the pins are in a high state. (Hopefully indicating they are pulled up.)
     IOMUXC_SetPinMux(sda->mux_reg, IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_ALT5, 0, 0, 0, 0);
@@ -153,8 +146,6 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
 }
 
 void common_hal_busio_i2c_never_reset(busio_i2c_obj_t *self) {
-    never_reset_i2c[self->sda->bank_idx - 1] = true;
-
     common_hal_never_reset_pin(self->sda->pin);
     common_hal_never_reset_pin(self->scl->pin);
 }
@@ -168,15 +159,17 @@ void common_hal_busio_i2c_deinit(busio_i2c_obj_t *self) {
         return;
     }
     reserved_i2c[self->sda->bank_idx - 1] = false;
-    never_reset_i2c[self->sda->bank_idx - 1] = false;
 
     LPI2C_MasterDeinit(self->i2c);
 
     common_hal_reset_pin(self->sda->pin);
     common_hal_reset_pin(self->scl->pin);
 
+    common_hal_busio_i2c_mark_deinit(self);
+}
+
+void common_hal_busio_i2c_mark_deinit(busio_i2c_obj_t *self) {
     self->sda = NULL;
-    self->scl = NULL;
 }
 
 bool common_hal_busio_i2c_probe(busio_i2c_obj_t *self, uint8_t addr) {
diff --git a/ports/mimxrt10xx/common-hal/busio/I2C.h b/ports/mimxrt10xx/common-hal/busio/I2C.h
index 06b86cd2d3401..153c2541090aa 100644
--- a/ports/mimxrt10xx/common-hal/busio/I2C.h
+++ b/ports/mimxrt10xx/common-hal/busio/I2C.h
@@ -19,5 +19,3 @@ typedef struct {
     const mcu_periph_obj_t *scl;
     const mcu_periph_obj_t *sda;
 } busio_i2c_obj_t;
-
-void i2c_reset(void);
diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c
index fe7ee14a3b7ac..d7f7f280d1958 100644
--- a/ports/mimxrt10xx/supervisor/port.c
+++ b/ports/mimxrt10xx/supervisor/port.c
@@ -22,7 +22,6 @@
 
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/rtc/RTC.h"
-#include "common-hal/busio/I2C.h"
 #include "common-hal/busio/SPI.h"
 #include "shared-bindings/microcontroller/__init__.h"
 
@@ -427,7 +426,6 @@ safe_mode_t port_init(void) {
 
 void reset_port(void) {
     #if CIRCUITPY_BUSIO
-    i2c_reset();
     spi_reset();
     #endif
 
diff --git a/ports/nordic/common-hal/busio/I2C.c b/ports/nordic/common-hal/busio/I2C.c
index 292f669f17044..3558fad165ba6 100644
--- a/ports/nordic/common-hal/busio/I2C.c
+++ b/ports/nordic/common-hal/busio/I2C.c
@@ -21,7 +21,8 @@
 // all TWI instances have the same max size
 // 16 bits for 840, 10 bits for 810, 8 bits for 832
 #define I2C_MAX_XFER_LEN         MIN(((1UL << TWIM0_EASYDMA_MAXCNT_SIZE) - 1), 1024)
-#define I2C_TIMEOUT 1000 // 1 second timeout
+// 1 second timeout
+#define I2C_TIMEOUT 1000
 
 static twim_peripheral_t twim_peripherals[] = {
     #if NRFX_CHECK(NRFX_TWIM0_ENABLED)
@@ -40,28 +41,10 @@ static twim_peripheral_t twim_peripherals[] = {
     #endif
 };
 
-static bool never_reset[MP_ARRAY_SIZE(twim_peripherals)];
-
-void i2c_reset(void) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(twim_peripherals); i++) {
-        if (never_reset[i]) {
-            continue;
-        }
-        nrfx_twim_uninit(&twim_peripherals[i].twim);
-        twim_peripherals[i].in_use = false;
-    }
-}
 
 void common_hal_busio_i2c_never_reset(busio_i2c_obj_t *self) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(twim_peripherals); i++) {
-        if (self->twim_peripheral == &twim_peripherals[i]) {
-            never_reset[i] = true;
-
-            never_reset_pin_number(self->scl_pin_number);
-            never_reset_pin_number(self->sda_pin_number);
-            break;
-        }
-    }
+    never_reset_pin_number(self->scl_pin_number);
+    never_reset_pin_number(self->sda_pin_number);
 }
 
 static uint8_t twi_error_to_mp(const nrfx_err_t err) {
@@ -91,6 +74,10 @@ static void twim_event_handler(nrfx_twim_evt_t const *p_event, void *p_context)
 }
 
 void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda, uint32_t frequency, uint32_t timeout) {
+
+    // Ensure the object starts in its deinit state.
+    common_hal_busio_i2c_mark_deinit(self);
+
     if (scl->number == sda->number) {
         raise_ValueError_invalid_pins();
     }
@@ -172,10 +159,13 @@ void common_hal_busio_i2c_deinit(busio_i2c_obj_t *self) {
 
     reset_pin_number(self->sda_pin_number);
     reset_pin_number(self->scl_pin_number);
-    self->sda_pin_number = NO_PIN;
-    self->scl_pin_number = NO_PIN;
 
     self->twim_peripheral->in_use = false;
+    common_hal_busio_i2c_mark_deinit(self);
+}
+
+void common_hal_busio_i2c_mark_deinit(busio_i2c_obj_t *self) {
+    self->sda_pin_number = NO_PIN;
 }
 
 // nrfx_twim_tx doesn't support 0-length data so we fall back to the hal API
diff --git a/ports/nordic/common-hal/busio/I2C.h b/ports/nordic/common-hal/busio/I2C.h
index d94ff6929bc4e..c1c1839f892d4 100644
--- a/ports/nordic/common-hal/busio/I2C.h
+++ b/ports/nordic/common-hal/busio/I2C.h
@@ -25,5 +25,3 @@ typedef struct {
     uint8_t scl_pin_number;
     uint8_t sda_pin_number;
 } busio_i2c_obj_t;
-
-void i2c_reset(void);
diff --git a/ports/nordic/supervisor/port.c b/ports/nordic/supervisor/port.c
index 759cb8ed42592..ed371c6ad8582 100644
--- a/ports/nordic/supervisor/port.c
+++ b/ports/nordic/supervisor/port.c
@@ -27,7 +27,6 @@
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/alarm/time/TimeAlarm.h"
 #include "common-hal/analogio/AnalogIn.h"
-#include "common-hal/busio/I2C.h"
 #include "common-hal/busio/SPI.h"
 #include "common-hal/busio/UART.h"
 #include "common-hal/rtc/RTC.h"
@@ -190,7 +189,6 @@ safe_mode_t port_init(void) {
 
 void reset_port(void) {
     #if CIRCUITPY_BUSIO
-    i2c_reset();
     spi_reset();
     uart_reset();
     #endif
diff --git a/ports/raspberrypi/common-hal/busio/I2C.c b/ports/raspberrypi/common-hal/busio/I2C.c
index d8e13344cfee7..3b7cf8662d90e 100644
--- a/ports/raspberrypi/common-hal/busio/I2C.c
+++ b/ports/raspberrypi/common-hal/busio/I2C.c
@@ -22,21 +22,14 @@
 // One second
 #define BUS_TIMEOUT_US 1000000
 
-static bool never_reset_i2c[2];
 static i2c_inst_t *i2c[2] = {i2c0, i2c1};
 
-void reset_i2c(void) {
-    for (size_t i = 0; i < 2; i++) {
-        if (never_reset_i2c[i]) {
-            continue;
-        }
-
-        i2c_deinit(i2c[i]);
-    }
-}
-
 void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda, uint32_t frequency, uint32_t timeout) {
+
+    // Ensure object starts in its deinit state.
+    common_hal_busio_i2c_mark_deinit(self);
+
     self->peripheral = NULL;
     // I2C pins have a regular pattern. SCL is always odd and SDA is even. They match up in pairs
     // so we can divide by two to get the instance. This pattern repeats.
@@ -115,14 +108,16 @@ void common_hal_busio_i2c_deinit(busio_i2c_obj_t *self) {
     if (common_hal_busio_i2c_deinited(self)) {
         return;
     }
-    never_reset_i2c[i2c_hw_index(self->peripheral)] = false;
 
     i2c_deinit(self->peripheral);
 
     reset_pin_number(self->sda_pin);
     reset_pin_number(self->scl_pin);
+    common_hal_busio_i2c_mark_deinit(self);
+}
+
+void common_hal_busio_i2c_mark_deinit(busio_i2c_obj_t *self) {
     self->sda_pin = NO_PIN;
-    self->scl_pin = NO_PIN;
 }
 
 bool common_hal_busio_i2c_probe(busio_i2c_obj_t *self, uint8_t addr) {
@@ -219,8 +214,6 @@ uint8_t common_hal_busio_i2c_write_read(busio_i2c_obj_t *self, uint16_t addr,
 }
 
 void common_hal_busio_i2c_never_reset(busio_i2c_obj_t *self) {
-    never_reset_i2c[i2c_hw_index(self->peripheral)] = true;
-
     never_reset_pin_number(self->scl_pin);
     never_reset_pin_number(self->sda_pin);
 }
diff --git a/ports/raspberrypi/common-hal/busio/I2C.h b/ports/raspberrypi/common-hal/busio/I2C.h
index 9d97025c48e2c..b02c1c54a31c4 100644
--- a/ports/raspberrypi/common-hal/busio/I2C.h
+++ b/ports/raspberrypi/common-hal/busio/I2C.h
@@ -22,5 +22,3 @@ typedef struct {
     uint8_t scl_pin;
     uint8_t sda_pin;
 } busio_i2c_obj_t;
-
-void reset_i2c(void);
diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c
index 9a52501196332..ffa25d12404ed 100644
--- a/ports/raspberrypi/supervisor/port.c
+++ b/ports/raspberrypi/supervisor/port.c
@@ -13,7 +13,6 @@
 
 #include "bindings/rp2pio/StateMachine.h"
 #include "genhdr/mpversion.h"
-#include "shared-bindings/busio/I2C.h"
 #include "shared-bindings/busio/SPI.h"
 #include "shared-bindings/countio/Counter.h"
 #include "shared-bindings/microcontroller/__init__.h"
@@ -367,7 +366,6 @@ safe_mode_t port_init(void) {
 
 void reset_port(void) {
     #if CIRCUITPY_BUSIO
-    reset_i2c();
     reset_spi();
     reset_uart();
     #endif
diff --git a/ports/silabs/common-hal/busio/I2C.c b/ports/silabs/common-hal/busio/I2C.c
index 7934416b12743..ae18f561c502f 100644
--- a/ports/silabs/common-hal/busio/I2C.c
+++ b/ports/silabs/common-hal/busio/I2C.c
@@ -32,15 +32,6 @@
 
 static I2CSPM_Init_TypeDef i2cspm_init;
 static bool in_used = false;
-static bool never_reset = false;
-
-// Reser I2C peripheral
-void i2c_reset(void) {
-    if ((!never_reset) && in_used) {
-        I2C_Reset(DEFAULT_I2C_PERIPHERAL);
-        in_used = false;
-    }
-}
 
 // Construct I2C protocol, this function init i2c peripheral
 void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
@@ -48,6 +39,9 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     const mcu_pin_obj_t *sda,
     uint32_t frequency, uint32_t timeout) {
 
+    // Ensure the object starts in its deinit state.
+    common_hal_busio_i2c_mark_deinit(self);
+
     if ((scl != NULL) && (sda != NULL)) {
         if (scl->function_list[ DEFAULT_I2C_PERIPHERAL == I2C1?
                                 FN_I2C1_SCL : FN_I2C0_SCL] == 1 &&
@@ -80,7 +74,6 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
 
 // Never reset I2C obj when reload
 void common_hal_busio_i2c_never_reset(busio_i2c_obj_t *self) {
-    never_reset = true;
     common_hal_never_reset_pin(self->sda);
     common_hal_never_reset_pin(self->scl);
 }
@@ -98,10 +91,13 @@ void common_hal_busio_i2c_deinit(busio_i2c_obj_t *self) {
     I2C_Reset(self->i2cspm);
     common_hal_reset_pin(self->sda);
     common_hal_reset_pin(self->scl);
-    self->sda = NULL;
-    self->scl = NULL;
     self->i2cspm = NULL;
     in_used = false;
+    common_hal_busio_i2c_mark_deinit(self);
+}
+
+void common_hal_busio_i2c_mark_deinit(busio_i2c_obj_t *self) {
+    self->sda = NULL;
 }
 
 // Probe device in I2C bus
diff --git a/ports/silabs/common-hal/busio/I2C.h b/ports/silabs/common-hal/busio/I2C.h
index 14f879ee445ad..a225299280a8d 100644
--- a/ports/silabs/common-hal/busio/I2C.h
+++ b/ports/silabs/common-hal/busio/I2C.h
@@ -24,8 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_EFR32_COMMON_HAL_BUSIO_I2C_H
-#define MICROPY_INCLUDED_EFR32_COMMON_HAL_BUSIO_I2C_H
+#pragma once
 
 #include "common-hal/microcontroller/Pin.h"
 #include "peripherals/periph.h"
@@ -40,7 +39,3 @@ typedef struct {
     const mcu_pin_obj_t *scl;
     const mcu_pin_obj_t *sda;
 } busio_i2c_obj_t;
-
-void i2c_reset(void);
-
-#endif  // MICROPY_INCLUDED_EFR32_COMMON_HAL_BUSIO_I2C_H
diff --git a/ports/silabs/supervisor/port.c b/ports/silabs/supervisor/port.c
index d94093b3e1da3..2409e907deac1 100644
--- a/ports/silabs/supervisor/port.c
+++ b/ports/silabs/supervisor/port.c
@@ -33,7 +33,6 @@
 #include "shared-bindings/microcontroller/__init__.h"
 
 #if CIRCUITPY_BUSIO
-#include "common-hal/busio/I2C.h"
 #include "common-hal/busio/SPI.h"
 #include "common-hal/busio/UART.h"
 #endif
@@ -160,7 +159,6 @@ void reset_port(void) {
     reset_all_pins();
 
     #if CIRCUITPY_BUSIO
-    i2c_reset();
     spi_reset();
     uart_reset();
     #endif
diff --git a/ports/stm/common-hal/busio/I2C.c b/ports/stm/common-hal/busio/I2C.c
index c58c1883df28c..e6957989cc72c 100644
--- a/ports/stm/common-hal/busio/I2C.c
+++ b/ports/stm/common-hal/busio/I2C.c
@@ -41,28 +41,18 @@
 #define MAX_I2C 4
 
 static bool reserved_i2c[MAX_I2C];
-static bool never_reset_i2c[MAX_I2C];
 
 #define ALL_CLOCKS 0xFF
 static void i2c_clock_enable(uint8_t mask);
 static void i2c_clock_disable(uint8_t mask);
 static void i2c_assign_irq(busio_i2c_obj_t *self, I2C_TypeDef *I2Cx);
 
-void i2c_reset(void) {
-    uint16_t never_reset_mask = 0x00;
-    for (int i = 0; i < MAX_I2C; i++) {
-        if (!never_reset_i2c[i]) {
-            reserved_i2c[i] = false;
-        } else {
-            never_reset_mask |= 1 << i;
-        }
-    }
-    i2c_clock_disable(ALL_CLOCKS & ~(never_reset_mask));
-}
-
 void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda, uint32_t frequency, uint32_t timeout) {
 
+    // Ensure the object starts in its deinit state.
+    common_hal_busio_i2c_mark_deinit(self);
+
     // Match pins to I2C objects
     I2C_TypeDef *I2Cx;
     uint8_t sda_len = MP_ARRAY_SIZE(mcu_i2c_sda_list);
@@ -163,15 +153,8 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
 }
 
 void common_hal_busio_i2c_never_reset(busio_i2c_obj_t *self) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(mcu_i2c_banks); i++) {
-        if (self->handle.Instance == mcu_i2c_banks[i]) {
-            never_reset_i2c[i] = true;
-
-            never_reset_pin_number(self->scl->pin->port, self->scl->pin->number);
-            never_reset_pin_number(self->sda->pin->port, self->sda->pin->number);
-            break;
-        }
-    }
+    never_reset_pin_number(self->scl->pin->port, self->scl->pin->number);
+    never_reset_pin_number(self->sda->pin->port, self->sda->pin->number);
 }
 
 bool common_hal_busio_i2c_deinited(busio_i2c_obj_t *self) {
@@ -185,12 +168,14 @@ void common_hal_busio_i2c_deinit(busio_i2c_obj_t *self) {
 
     i2c_clock_disable(1 << (self->sda->periph_index - 1));
     reserved_i2c[self->sda->periph_index - 1] = false;
-    never_reset_i2c[self->sda->periph_index - 1] = false;
 
     reset_pin_number(self->sda->pin->port, self->sda->pin->number);
     reset_pin_number(self->scl->pin->port, self->scl->pin->number);
+    common_hal_busio_i2c_mark_deinit(self);
+}
+
+void common_hal_busio_i2c_mark_deinit(busio_i2c_obj_t *self) {
     self->sda = NULL;
-    self->scl = NULL;
 }
 
 bool common_hal_busio_i2c_probe(busio_i2c_obj_t *self, uint8_t addr) {
diff --git a/ports/stm/common-hal/busio/I2C.h b/ports/stm/common-hal/busio/I2C.h
index ff78ddb35af38..c79a077dcabaf 100644
--- a/ports/stm/common-hal/busio/I2C.h
+++ b/ports/stm/common-hal/busio/I2C.h
@@ -22,5 +22,3 @@ typedef struct {
     const mcu_periph_obj_t *scl;
     const mcu_periph_obj_t *sda;
 } busio_i2c_obj_t;
-
-void i2c_reset(void);
diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
index 5b903044b61cd..55402eb8b2843 100644
--- a/ports/stm/supervisor/port.c
+++ b/ports/stm/supervisor/port.c
@@ -14,7 +14,6 @@
 #include "shared-bindings/microcontroller/__init__.h"
 
 #if CIRCUITPY_BUSIO
-#include "common-hal/busio/I2C.h"
 #include "common-hal/busio/SPI.h"
 #include "common-hal/busio/UART.h"
 #endif
@@ -219,7 +218,6 @@ void reset_port(void) {
     #endif
 
     #if CIRCUITPY_BUSIO
-    i2c_reset();
     spi_reset();
     uart_reset();
     #endif
diff --git a/shared-bindings/bitbangio/I2C.c b/shared-bindings/bitbangio/I2C.c
index 491833c27d45f..c1e42511e975c 100644
--- a/shared-bindings/bitbangio/I2C.c
+++ b/shared-bindings/bitbangio/I2C.c
@@ -59,7 +59,7 @@ static mp_obj_t bitbangio_i2c_make_new(const mp_obj_type_t *type, size_t n_args,
     const mcu_pin_obj_t *scl = validate_obj_is_free_pin(args[ARG_scl].u_obj, MP_QSTR_scl);
     const mcu_pin_obj_t *sda = validate_obj_is_free_pin(args[ARG_sda].u_obj, MP_QSTR_sda);
 
-    bitbangio_i2c_obj_t *self = mp_obj_malloc(bitbangio_i2c_obj_t, &bitbangio_i2c_type);
+    bitbangio_i2c_obj_t *self = mp_obj_malloc_with_finaliser(bitbangio_i2c_obj_t, &bitbangio_i2c_type);
     shared_module_bitbangio_i2c_construct(self, scl, sda, args[ARG_frequency].u_int, args[ARG_timeout].u_int);
     return (mp_obj_t)self;
 }
@@ -102,6 +102,23 @@ static void check_lock(bitbangio_i2c_obj_t *self) {
     }
 }
 
+//|     def probe(self, address: int) -> List[int]:
+//|         """Check if a device at the specified address responds.
+//|
+//|         :param int address: 7-bit device address
+//|         :return: ``True`` if a device at ``address`` responds; ``False`` otherwise
+//|         :rtype: bool"""
+//|         ...
+static mp_obj_t bitbangio_i2c_probe(mp_obj_t self_in, mp_obj_t address_obj) {
+    bitbangio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    check_lock(self);
+
+    const uint16_t addr = mp_obj_get_int(address_obj);
+    return mp_obj_new_bool(shared_module_bitbangio_i2c_probe(self, addr));
+}
+MP_DEFINE_CONST_FUN_OBJ_2(bitbangio_i2c_probe_obj, bitbangio_i2c_probe);
+
 //|     def scan(self) -> List[int]:
 //|         """Scan all I2C addresses between 0x08 and 0x77 inclusive and return a list of
 //|         those that respond.  A device responds if it pulls the SDA line low after
@@ -330,6 +347,7 @@ static const mp_rom_map_elem_t bitbangio_i2c_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&bitbangio_i2c_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&bitbangio_i2c_obj___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_probe), MP_ROM_PTR(&bitbangio_i2c_probe_obj) },
     { MP_ROM_QSTR(MP_QSTR_scan), MP_ROM_PTR(&bitbangio_i2c_scan_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_try_lock), MP_ROM_PTR(&bitbangio_i2c_try_lock_obj) },
diff --git a/shared-bindings/busio/I2C.c b/shared-bindings/busio/I2C.c
index 8a1b832a7a8d8..243054e8e18d8 100644
--- a/shared-bindings/busio/I2C.c
+++ b/shared-bindings/busio/I2C.c
@@ -42,13 +42,12 @@
 //|         :param ~microcontroller.Pin scl: The clock pin
 //|         :param ~microcontroller.Pin sda: The data pin
 //|         :param int frequency: The clock frequency in Hertz
-//|         :param int timeout: The maximum clock stretching timeut - (used only for
+//|         :param int timeout: The maximum clock stretching timeout - (used only for
 //|             :class:`bitbangio.I2C`; ignored for :class:`busio.I2C`)
 //|         """
 //|         ...
 static mp_obj_t busio_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     #if CIRCUITPY_BUSIO_I2C
-    busio_i2c_obj_t *self = mp_obj_malloc(busio_i2c_obj_t, &busio_i2c_type);
     enum { ARG_scl, ARG_sda, ARG_frequency, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_scl, MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -62,6 +61,7 @@ static mp_obj_t busio_i2c_make_new(const mp_obj_type_t *type, size_t n_args, siz
     const mcu_pin_obj_t *scl = validate_obj_is_free_pin(args[ARG_scl].u_obj, MP_QSTR_scl);
     const mcu_pin_obj_t *sda = validate_obj_is_free_pin(args[ARG_sda].u_obj, MP_QSTR_sda);
 
+    busio_i2c_obj_t *self = mp_obj_malloc_with_finaliser(busio_i2c_obj_t, &busio_i2c_type);
     common_hal_busio_i2c_construct(self, scl, sda, args[ARG_frequency].u_int, args[ARG_timeout].u_int);
     return (mp_obj_t)self;
     #else
@@ -110,6 +110,23 @@ static void check_lock(busio_i2c_obj_t *self) {
     }
 }
 
+//|     def probe(self, address: int) -> List[int]:
+//|         """Check if a device at the specified address responds.
+//|
+//|         :param int address: 7-bit device address
+//|         :return: ``True`` if a device at ``address`` responds; ``False`` otherwise
+//|         :rtype: bool"""
+//|         ...
+static mp_obj_t busio_i2c_probe(mp_obj_t self_in, mp_obj_t address_obj) {
+    busio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    check_lock(self);
+
+    const uint16_t addr = mp_obj_get_int(address_obj);
+    return mp_obj_new_bool(common_hal_busio_i2c_probe(self, addr));
+}
+MP_DEFINE_CONST_FUN_OBJ_2(busio_i2c_probe_obj, busio_i2c_probe);
+
 //|     def scan(self) -> List[int]:
 //|         """Scan all I2C addresses between 0x08 and 0x77 inclusive and return a
 //|         list of those that respond.
@@ -364,6 +381,7 @@ static const mp_rom_map_elem_t busio_i2c_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&busio_i2c_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&busio_i2c___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_probe), MP_ROM_PTR(&busio_i2c_probe_obj) },
     { MP_ROM_QSTR(MP_QSTR_scan), MP_ROM_PTR(&busio_i2c_scan_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_try_lock), MP_ROM_PTR(&busio_i2c_try_lock_obj) },
diff --git a/shared-bindings/busio/I2C.h b/shared-bindings/busio/I2C.h
index da505436b0868..55f2d0f010850 100644
--- a/shared-bindings/busio/I2C.h
+++ b/shared-bindings/busio/I2C.h
@@ -19,11 +19,15 @@ extern void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     const mcu_pin_obj_t *scl,
     const mcu_pin_obj_t *sda,
     uint32_t frequency,
-    uint32_t timeout);
+    uint32_t timeout_ms);
 
 extern void common_hal_busio_i2c_deinit(busio_i2c_obj_t *self);
 extern bool common_hal_busio_i2c_deinited(busio_i2c_obj_t *self);
 
+// Mark as deinit without deiniting. This is used by displayio after copying the
+// object elsewhere and prevents the heap from deiniting the object.
+extern void common_hal_busio_i2c_mark_deinit(busio_i2c_obj_t *self);
+
 extern bool common_hal_busio_i2c_try_lock(busio_i2c_obj_t *self);
 extern bool common_hal_busio_i2c_has_lock(busio_i2c_obj_t *self);
 extern void common_hal_busio_i2c_unlock(busio_i2c_obj_t *self);
diff --git a/shared-module/adafruit_bus_device/i2c_device/I2CDevice.c b/shared-module/adafruit_bus_device/i2c_device/I2CDevice.c
index 0795e29f38294..e01875452b119 100644
--- a/shared-module/adafruit_bus_device/i2c_device/I2CDevice.c
+++ b/shared-module/adafruit_bus_device/i2c_device/I2CDevice.c
@@ -41,30 +41,14 @@ void common_hal_adafruit_bus_device_i2cdevice_unlock(adafruit_bus_device_i2cdevi
 void common_hal_adafruit_bus_device_i2cdevice_probe_for_device(adafruit_bus_device_i2cdevice_obj_t *self) {
     common_hal_adafruit_bus_device_i2cdevice_lock(self);
 
-    mp_buffer_info_t write_bufinfo;
-    mp_obj_t write_buffer = mp_obj_new_bytearray_of_zeros(0);
-    mp_get_buffer_raise(write_buffer, &write_bufinfo, MP_BUFFER_READ);
+    mp_obj_t dest[3];
+    mp_load_method(self->i2c, MP_QSTR_probe, dest);
+    dest[2] = MP_OBJ_NEW_SMALL_INT(self->device_address);
+    const bool found = mp_obj_is_true(mp_call_method_n_kw(1, 0, dest));
 
-    mp_obj_t dest[4];
-
-    /* catch exceptions that may be thrown while probing for the device */
-    nlr_buf_t nlr;
-    if (nlr_push(&nlr) == 0) {
-        mp_load_method(self->i2c, MP_QSTR_writeto, dest);
-        dest[2] = MP_OBJ_NEW_SMALL_INT(self->device_address);
-        dest[3] = write_buffer;
-        mp_call_method_n_kw(2, 0, dest);
-        nlr_pop();
-    } else {
-        common_hal_adafruit_bus_device_i2cdevice_unlock(self);
+    common_hal_adafruit_bus_device_i2cdevice_unlock(self);
 
-        if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(((mp_obj_base_t *)nlr.ret_val)->type), MP_OBJ_FROM_PTR(&mp_type_OSError))) {
-            mp_raise_ValueError_varg(MP_ERROR_TEXT("No I2C device at address: 0x%x"), self->device_address);
-        } else {
-            /* In case we receive an unrelated exception pass it up */
-            nlr_raise(MP_OBJ_FROM_PTR(nlr.ret_val));
-        }
+    if (!found) {
+        mp_raise_ValueError_varg(MP_ERROR_TEXT("No I2C device at address: 0x%x"), self->device_address);
     }
-
-    common_hal_adafruit_bus_device_i2cdevice_unlock(self);
 }
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index 8b3c9556f4886..3e1246b087600 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -12,6 +12,7 @@
 #include "shared/runtime/interrupt_char.h"
 #include "py/runtime.h"
 #include "shared-bindings/board/__init__.h"
+#include "shared-bindings/busio/I2C.h"
 #include "shared-bindings/displayio/Bitmap.h"
 #include "shared-bindings/displayio/Group.h"
 #include "shared-bindings/displayio/Palette.h"
@@ -236,6 +237,8 @@ void reset_displays(void) {
                         display_buses[j].i2cdisplay_bus.bus = &i2c->inline_bus;
                     }
                 }
+                // Mark the old i2c object so it is considered deinit.
+                common_hal_busio_i2c_mark_deinit(original_i2c);
             }
         #endif
         #if CIRCUITPY_RGBMATRIX