diff --git a/device/esp_tinyusb/CHANGELOG.md b/device/esp_tinyusb/CHANGELOG.md
index 0e85a4701..128132f05 100644
--- a/device/esp_tinyusb/CHANGELOG.md
+++ b/device/esp_tinyusb/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.2.0
+
+- esp_tinyusb: Added ESP32-S31 support
+
 ## 2.1.1
 
 - esp_tinyusb: Fixed VBUS monitoring feature on ESP32-P4 USB OTG 2.0 (HS)
diff --git a/device/esp_tinyusb/idf_component.yml b/device/esp_tinyusb/idf_component.yml
index 666aeaee2..045e5e7e0 100644
--- a/device/esp_tinyusb/idf_component.yml
+++ b/device/esp_tinyusb/idf_component.yml
@@ -1,7 +1,7 @@
 ## IDF Component Manager Manifest File
 description: Espressif's additions to TinyUSB
 documentation: "https://docs.espressif.com/projects/esp-usb/en/latest/esp32p4/usb_device.html"
-version: "2.1.1"
+version: "2.2.0"
 url: https://github.com/espressif/esp-usb/tree/master/device/esp_tinyusb
 repository: "https://github.com/espressif/esp-usb.git"
 repository_info:
@@ -15,7 +15,7 @@ targets:
 dependencies:
   idf: '>=5.0' # IDF 4.x contains TinyUSB as submodule
   tinyusb:
-    version: '>=0.19.0~3-rc1'
+    version: '>=0.17.0~2' # 0.17.0~2 is the first version that supports deinit
     public: true
 files:
   exclude: