diff --git a/cores/rp2040/RP2040Support.h b/cores/rp2040/RP2040Support.h
index 44567cc7f..811146565 100644
--- a/cores/rp2040/RP2040Support.h
+++ b/cores/rp2040/RP2040Support.h
@@ -72,7 +72,6 @@ class _MFIFO {
 
     void registerCore() {
 #ifndef __FREERTOS
-        multicore_doorbell_clear_current_core(_doorbell);
         uint32_t irq = multicore_doorbell_irq_num(_doorbell);
         irq_add_shared_handler(irq, _irq, 128);
         irq_set_enabled(irq, true);
diff --git a/include/rp2040/pico_base/pico/version.h b/include/rp2040/pico_base/pico/version.h
index 793f76460..793d1be60 100644
--- a/include/rp2040/pico_base/pico/version.h
+++ b/include/rp2040/pico_base/pico/version.h
@@ -13,7 +13,7 @@
 
 #define PICO_SDK_VERSION_MAJOR    2
 #define PICO_SDK_VERSION_MINOR    2
-#define PICO_SDK_VERSION_REVISION 0
-#define PICO_SDK_VERSION_STRING   "2.2.0"
+#define PICO_SDK_VERSION_REVISION 1
+#define PICO_SDK_VERSION_STRING   "2.2.1-develop"
 
 #endif
diff --git a/include/rp2350/pico_base/pico/version.h b/include/rp2350/pico_base/pico/version.h
index 793f76460..793d1be60 100644
--- a/include/rp2350/pico_base/pico/version.h
+++ b/include/rp2350/pico_base/pico/version.h
@@ -13,7 +13,7 @@
 
 #define PICO_SDK_VERSION_MAJOR    2
 #define PICO_SDK_VERSION_MINOR    2
-#define PICO_SDK_VERSION_REVISION 0
-#define PICO_SDK_VERSION_STRING   "2.2.0"
+#define PICO_SDK_VERSION_REVISION 1
+#define PICO_SDK_VERSION_STRING   "2.2.1-develop"
 
 #endif
diff --git a/include/tusb_config.h b/include/tusb_config.h
index 91c9c1a7a..e867b2074 100644
--- a/include/tusb_config.h
+++ b/include/tusb_config.h
@@ -73,7 +73,7 @@
 #define CFG_TUD_HID              (2)
 #define CFG_TUD_CDC              (1)
 #define CFG_TUD_MSC              (1)
-#define CFG_TUD_MIDI             (0)
+#define CFG_TUD_MIDI             (1)
 #define CFG_TUD_VENDOR           (0)
 
 #define CFG_TUD_CDC_RX_BUFSIZE  (256)
@@ -84,6 +84,10 @@
 // HID buffer size Should be sufficient to hold ID (if any) + Data
 #define CFG_TUD_HID_EP_BUFSIZE  (64)
 
+// MIDI
+#define CFG_TUD_MIDI_RX_BUFSIZE (64)
+#define CFG_TUD_MIDI_TX_BUFSIZE (64)
+
 #ifdef __cplusplus
  }
 #endif
diff --git a/lib/platform_def.txt b/lib/platform_def.txt
index ba73b65bf..7ad171148 100644
--- a/lib/platform_def.txt
+++ b/lib/platform_def.txt
@@ -70,6 +70,7 @@
 -DPICO_RP2040_USB_DEVICE_UFRAME_FIX=1
 -DPICO_USE_BLOCKED_RAM=0
 -DPICO_XOSC_STARTUP_DELAY_MULTIPLIER=64
+-DPICO_MAX_SHARED_IRQ_HANDLERS=6
 
 -DPICO_CYW43_ARCH_HEADER=stdint.h
 -DCYW43_TASK_STACK_SIZE=1024
diff --git a/lib/rp2040/liblwip-bt.a b/lib/rp2040/liblwip-bt.a
index cf1b86592..6c0e63425 100644
Binary files a/lib/rp2040/liblwip-bt.a and b/lib/rp2040/liblwip-bt.a differ
diff --git a/lib/rp2040/liblwip.a b/lib/rp2040/liblwip.a
index e1669eca9..b6b044ee9 100644
Binary files a/lib/rp2040/liblwip.a and b/lib/rp2040/liblwip.a differ
diff --git a/lib/rp2040/libpico.a b/lib/rp2040/libpico.a
index 62750c3dd..872dce81c 100644
Binary files a/lib/rp2040/libpico.a and b/lib/rp2040/libpico.a differ
diff --git a/lib/rp2350-riscv/liblwip-bt.a b/lib/rp2350-riscv/liblwip-bt.a
index 16d178653..f972f7ec6 100644
Binary files a/lib/rp2350-riscv/liblwip-bt.a and b/lib/rp2350-riscv/liblwip-bt.a differ
diff --git a/lib/rp2350-riscv/liblwip.a b/lib/rp2350-riscv/liblwip.a
index b1850ffa4..9b19a2957 100644
Binary files a/lib/rp2350-riscv/liblwip.a and b/lib/rp2350-riscv/liblwip.a differ
diff --git a/lib/rp2350-riscv/libpico.a b/lib/rp2350-riscv/libpico.a
index e457e2f55..59fbefd87 100644
Binary files a/lib/rp2350-riscv/libpico.a and b/lib/rp2350-riscv/libpico.a differ
diff --git a/lib/rp2350/liblwip-bt.a b/lib/rp2350/liblwip-bt.a
index 33a5830e7..2cefd22ad 100644
Binary files a/lib/rp2350/liblwip-bt.a and b/lib/rp2350/liblwip-bt.a differ
diff --git a/lib/rp2350/liblwip.a b/lib/rp2350/liblwip.a
index 435b6bcb5..c84fdae7e 100644
Binary files a/lib/rp2350/liblwip.a and b/lib/rp2350/liblwip.a differ
diff --git a/lib/rp2350/libpico.a b/lib/rp2350/libpico.a
index ca023bd6b..dfc5348b6 100644
Binary files a/lib/rp2350/libpico.a and b/lib/rp2350/libpico.a differ
diff --git a/pico-sdk b/pico-sdk
index a1438dff1..8fcd44a17 160000
--- a/pico-sdk
+++ b/pico-sdk
@@ -1 +1 @@
-Subproject commit a1438dff1d38bd9c65dbd693f0e5db4b9ae91779
+Subproject commit 8fcd44a1718337861214ba5499a8faceea2bfa1d
diff --git a/tools/libpico/CMakeLists.txt b/tools/libpico/CMakeLists.txt
index 5086f00eb..eae887c8b 100644
--- a/tools/libpico/CMakeLists.txt
+++ b/tools/libpico/CMakeLists.txt
@@ -70,6 +70,8 @@ target_compile_definitions(common-${cpu} INTERFACE
     PICO_PRINTF_ALWAYS_INCLUDED=1
     PICO_FLASH_SIZE_BYTES=16777216
 
+    PICO_MAX_SHARED_IRQ_HANDLERS=6
+
     PICO_32BIT=1
     PICO_NO_BINARY_INFO=1
     PICO_NO_FLASH=0