Merge branch 'bugfix/fix_esp32s3_usb_otg_v4.4' into 'release/v4.4'

esp_phy: fix esp32s3 phy work with USB-OTG issue(v4.4) See merge request espressif/esp-idf!15914
espressif · Nov 22, 2021 · 81ce15f · 81ce15f
2 parents 7816b59 + c3951d5
commit 81ce15f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/components/esp_phy/Kconfig b/components/esp_phy/Kconfig
@@ -106,10 +106,11 @@ menu "PHY"
 
     config ESP_PHY_ENABLE_USB
         bool "Enable USB when phy init"
-        depends on ESP_CONSOLE_USB_SERIAL_JTAG
-        default y
+        depends on USB_OTG_SUPPORTED || ESP_CONSOLE_USB_SERIAL_JTAG
+        default y if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3
+        default n
         help
-            When using USB Serial/JTAG controller, PHY should enable USB, otherwise log will
-            not be displayed. But working with USB, the RF performance may be affected.
+            When using USB Serial/JTAG/OTG/CDC, PHY should enable USB, otherwise USB module
+            can not work properly.
 
 endmenu  # PHY
diff --git a/components/esp_phy/lib b/components/esp_phy/lib