diff --git a/.gitmodules b/.gitmodules
index b1ec0f9faee7f..777f315707677 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -68,8 +68,8 @@
 	url = https://github.com/adafruit/nrfx.git
 [submodule "lib/tinyusb"]
 	path = lib/tinyusb
-	url = https://github.com/hathach/tinyusb.git
-	branch = master
+	url = https://github.com/tannewt/tinyusb.git
+	branch = esp32c5_c61
 	fetchRecurseSubmodules = false
 [submodule "tools/huffman"]
 	path = tools/huffman
@@ -143,7 +143,7 @@
 [submodule "ports/espressif/esp-idf"]
 	path = ports/espressif/esp-idf
 	url = https://github.com/adafruit/esp-idf.git
-	branch = circuitpython-v5.4.1
+	branch = circuitpython-v5.5
 [submodule "ports/espressif/esp-protocols"]
 	path = ports/espressif/esp-protocols
 	url = https://github.com/adafruit/esp-protocols.git
diff --git a/lib/protomatter b/lib/protomatter
index 0bd9873153ab0..f83bac7e42107 160000
--- a/lib/protomatter
+++ b/lib/protomatter
@@ -1 +1 @@
-Subproject commit 0bd9873153ab0a91d6737c392622159a4515a2e5
+Subproject commit f83bac7e421077812523fddb83d3e25f29753315
diff --git a/lib/tinyusb b/lib/tinyusb
index 5fb3c09963bca..ddb8f0fe73fd7 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 5fb3c09963bca362e535788e289d4b3518da5973
+Subproject commit ddb8f0fe73fd733b0fd97462b14825dcb6039949
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index a063101991fdb..4c3cc8b08e007 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -64,6 +64,7 @@ INC += \
 	-isystem esp-idf/components/esp_driver_i2s/include \
 	-isystem esp-idf/components/esp_driver_$(IDF_TARGET)/include \
 	-isystem esp-idf/components/esp_driver_ledc/include \
+	-isystem esp-idf/components/esp_driver_parlio/include \
 	-isystem esp-idf/components/esp_driver_pcnt/include \
 	-isystem esp-idf/components/esp_driver_rmt/include \
 	-isystem esp-idf/components/esp_driver_sdio/include \
@@ -156,11 +157,13 @@ REGISTRATION_FUNCTIONS = \
 	-u __ubsan_include \
 	-u esp_system_include_startup_funcs \
 	-u esp_efuse_startup_include_func \
-	-u newlib_include_heap_impl \
-	-u newlib_include_syscalls_impl \
-	-u newlib_include_pthread_impl \
-	-u newlib_include_assert_impl \
-	-u newlib_include_init_funcs \
+	-u esp_libc_include_heap_impl \
+	-u esp_libc_include_reent_syscalls_impl \
+	-u esp_libc_include_syscalls_impl \
+	-u esp_libc_include_pthread_impl \
+	-u esp_libc_include_assert_impl \
+	-u esp_libc_include_getentropy_impl \
+	-u esp_libc_include_init_funcs \
 	-u include_esp_phy_override \
 	-u vfs_include_syscalls_impl
 
@@ -222,7 +225,6 @@ else ifeq ($(IDF_TARGET_ARCH),riscv)
 		-Trom.api.ld
 endif
 
-$(BUILD)/lib/tlsf/tlsf.o: CFLAGS += -Wno-cast-align
 
 LDFLAGS += $(CFLAGS) -Wl,-nostdlib -Wl,-Map=$@.map -Wl,-cref -Wl,--undefined=uxTopUsedPriority
 
@@ -244,7 +246,8 @@ LDFLAGS += \
 ifeq ($(IDF_TARGET),esp32)
 LDFLAGS += \
 	-Tesp32.rom.newlib-data.ld \
-	-Tesp32.rom.newlib-funcs.ld \
+	-Tesp32.rom.libc-funcs.ld \
+	-Tesp32.rom.newlib-reent-funcs.ld \
 	-Tesp32.rom.spiflash_legacy.ld
 
 CHIP_COMPONENTS = \
@@ -312,8 +315,9 @@ CHIP_COMPONENTS = \
 
 else ifeq ($(IDF_TARGET),esp32s2)
 LDFLAGS += \
+	-Tesp32s2.rom.libc-funcs.ld \
 	-Tesp32s2.rom.newlib-data.ld \
-	-Tesp32s2.rom.newlib-funcs.ld \
+	-Tesp32s2.rom.newlib-reent-funcs.ld \
 	-Tesp32s2.rom.spiflash_legacy.ld
 
 CHIP_COMPONENTS = \
@@ -782,7 +786,7 @@ endif
 
 IDF_CMAKE_TARGETS = \
 		bootloader/bootloader.bin \
-		esp-idf/esp_system/__ldgen_output_sections.ld \
+		__ldgen_output_sections.ld \
 		$(foreach component, $(ESP_IDF_COMPONENTS_LINK), esp-idf/$(component)/lib$(component).a)
 
 PARTITION_TABLE_OFFSET = 0x8000
diff --git a/ports/espressif/common-hal/alarm/pin/PinAlarm.c b/ports/espressif/common-hal/alarm/pin/PinAlarm.c
index 8e3e46785f2e7..cecb91fe46df9 100644
--- a/ports/espressif/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/espressif/common-hal/alarm/pin/PinAlarm.c
@@ -14,10 +14,12 @@
 
 #include "esp_sleep.h"
 #include "hal/gpio_ll.h"
+#include "driver/gpio.h"
 #include "esp_debug_helpers.h"
 
 #ifdef SOC_PM_SUPPORT_EXT0_WAKEUP
 #include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_io_reg.h"
 #endif
 
 #include "driver/rtc_io.h"
diff --git a/ports/espressif/common-hal/analogio/AnalogIn.c b/ports/espressif/common-hal/analogio/AnalogIn.c
index 16340e91ac91c..b4039b3d32dd8 100644
--- a/ports/espressif/common-hal/analogio/AnalogIn.c
+++ b/ports/espressif/common-hal/analogio/AnalogIn.c
@@ -86,10 +86,8 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
 
     adc_cali_scheme_ver_t supported_schemes;
     adc_cali_check_scheme(&supported_schemes);
-    #ifndef CONFIG_IDF_TARGET_ESP32P4
     adc_cali_scheme_ver_t calibration_scheme = 0;
     adc_cali_handle_t calibration;
-    #endif
     #if defined(ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED) && ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
     adc_cali_curve_fitting_config_t config = {
         .unit_id = self->pin->adc_index,
@@ -137,11 +135,7 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
 
     // This corrects non-linear regions of the ADC range with a LUT, so it's a better reading than raw
     int voltage;
-    #ifdef CONFIG_IDF_TARGET_ESP32P4
-    voltage = 0;
-    #else
     adc_cali_raw_to_voltage(calibration, adc_reading, &voltage);
-    #endif
 
     #if defined(ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED) && ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
     if (calibration_scheme == ADC_CALI_SCHEME_VER_CURVE_FITTING) {
diff --git a/ports/espressif/common-hal/espnow/ESPNow.c b/ports/espressif/common-hal/espnow/ESPNow.c
index 79bded96fb41d..ae11db250321c 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.c
+++ b/ports/espressif/common-hal/espnow/ESPNow.c
@@ -56,7 +56,7 @@ typedef struct {
 // Callback triggered when a sent packet is acknowledged by the peer (or not).
 // Just count the number of responses and number of failures.
 // These are used in the send() logic.
-static void send_cb(const uint8_t *mac, esp_now_send_status_t status) {
+static void send_cb(const esp_now_send_info_t *tx_info, esp_now_send_status_t status) {
     espnow_obj_t *self = MP_STATE_PORT(espnow_singleton);
     if (status == ESP_NOW_SEND_SUCCESS) {
         self->send_success++;
diff --git a/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c b/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
index 7721b5e197f49..52c4b67bf4efe 100644
--- a/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
+++ b/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
@@ -18,7 +18,7 @@
 #include "common-hal/microcontroller/Pin.h"
 #include "py/runtime.h"
 
-#include "driver/gpio.h"
+#include <driver/gpio.h>
 
 /*
  *  Current pin limitations for ESP32-S2 ParallelBus:
diff --git a/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.h b/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.h
index 4724ba7231a4e..114a1e527a6d5 100644
--- a/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.h
+++ b/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.h
@@ -8,7 +8,7 @@
 
 #include "common-hal/digitalio/DigitalInOut.h"
 
-#include "esp-idf/components/esp_lcd/include/esp_lcd_panel_io.h"
+#include <esp-idf/components/esp_lcd/include/esp_lcd_panel_io.h>
 
 typedef struct {
     mp_obj_base_t base;
diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
index f50ec8ecdb31f..708e23aba506d 160000
--- a/ports/espressif/esp-idf
+++ b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit f50ec8ecdb31f681e6a778f145de95f849c1089d
+Subproject commit 708e23aba506da9f8ec9be7c947cd166ab785af7
diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults
index b54f599b2a5b7..f4da268abedf6 100644
--- a/ports/espressif/esp-idf-config/sdkconfig.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig.defaults
@@ -20,6 +20,12 @@ CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM=y
 CONFIG_GPTIMER_ISR_IRAM_SAFE=y
 # end of GPTimer Configuration
 
+#
+# Touch Configuration
+#
+CONFIG_TOUCH_SUPPRESS_DEPRECATE_WARN=y
+# end of Touch Configuration
+
 # end of Driver Configurations
 
 #
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index f05df8c07c87a..28c0ca4657221 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -54,6 +54,8 @@ CIRCUITPY_HASHLIB_MBEDTLS_ONLY = 0
 
 CIRCUITPY_PORT_SERIAL = 1
 
+CIRCUITPY_LIB_TLSF = 0
+
 # These modules are implemented in ports/<port>/common-hal:
 CIRCUITPY__EVE ?= 1
 CIRCUITPY_ALARM ?= 1
diff --git a/ports/espressif/peripherals/pins.h b/ports/espressif/peripherals/pins.h
index f89855e308f59..f185cee92c437 100644
--- a/ports/espressif/peripherals/pins.h
+++ b/ports/espressif/peripherals/pins.h
@@ -14,7 +14,7 @@
 
 #include "components/hal/include/hal/gpio_types.h"
 #include "components/hal/include/hal/adc_types.h"
-#include "components/hal/include/hal/touch_sensor_types.h"
+#include "components/hal/include/hal/touch_sensor_legacy_types.h"
 
 typedef struct {
     mp_obj_base_t base;
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 2009c4e177da6..695d6c85ab047 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -62,6 +62,10 @@ CFLAGS += -DCIRCUITPY_FULL_BUILD=$(CIRCUITPY_FULL_BUILD)
 # increased build time
 CIRCUITPY_MESSAGE_COMPRESSION_LEVEL ?= 9
 
+# By default, use our copy of TLSF. Some vendor SDKs may provide their own
+# implementation of TLSF, which can be used instead by setting CIRCUITPY_LIB_TLSF=0.
+CIRCUITPY_LIB_TLSF ?= 1
+
 # Reduce the size of in-flash properties. Requires support in the .ld linker
 # file, so not enabled by default.
 CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 0
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index 0ecc6ea3acfe6..21bda334131c7 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -1,6 +1,5 @@
 SRC_SUPERVISOR = \
 	main.c \
-	lib/tlsf/tlsf.c \
 	supervisor/port.c \
 	supervisor/shared/background_callback.c \
 	supervisor/shared/board.c \
@@ -20,6 +19,10 @@ SRC_SUPERVISOR = \
 	supervisor/shared/translate/translate.c \
 	supervisor/shared/workflow.c \
 
+ifeq ($(CIRCUITPY_LIB_TLSF),1)
+SRC_SUPERVISOR += lib/tlsf/tlsf.c
+endif
+
 # For tlsf
 CFLAGS += -D_DEBUG=0