diff --git a/.gitmodules b/.gitmodules
index c60def69722e3..f52ca8e7fa756 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -346,7 +346,7 @@
 	url = https://github.com/adafruit/Adafruit_CircuitPython_Wave.git
 [submodule "ports/raspberrypi/lib/Pico-PIO-USB"]
 	path = ports/raspberrypi/lib/Pico-PIO-USB
-	url = https://github.com/adafruit/Pico-PIO-USB.git
+	url = https://github.com/sekigon-gonnoc/Pico-PIO-USB.git
 	branch = main
 [submodule "lib/micropython-lib"]
 	path = lib/micropython-lib
diff --git a/lib/tinyusb b/lib/tinyusb
index 8c1802e41d37c..60e6d53d10082 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 8c1802e41d37c915334a19b859b24cb2a1b48ee5
+Subproject commit 60e6d53d10082df884819c3958e621a2e1e0a214
diff --git a/ports/raspberrypi/lib/Pico-PIO-USB b/ports/raspberrypi/lib/Pico-PIO-USB
index e0aba546813d8..7e1c086ba865a 160000
--- a/ports/raspberrypi/lib/Pico-PIO-USB
+++ b/ports/raspberrypi/lib/Pico-PIO-USB
@@ -1 +1 @@
-Subproject commit e0aba546813d89cb7f321bef3363bfba5f282e14
+Subproject commit 7e1c086ba865aa5918419193bb19855cd69ffc30