espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

usb_serial_jtag: can print when wifi enabled by default

Browse Source 
Closes https://github.com/espressif/esp-idf/issues/8131
This commit is contained in:
Cao Sen Miao
2021-12-22 12:44:00 +08:00
committed by bot
parent 83daa6dabb
commit bf523af21d
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_phy/Kconfig
View File

@@ -106,11 +106,11 @@ menu "PHY"
config ESP_PHY_ENABLE_USB config ESP_PHY_ENABLE_USB
bool "Enable USB when phy init" bool "Enable USB when phy init"
depends on USB_OTG_SUPPORTED || ESP_CONSOLE_USB_SERIAL_JTAG depends on USB_OTG_SUPPORTED || ESP_CONSOLE_USB_SERIAL_JTAG || ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG
default y if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 default y if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3
default n default n
help help
When using USB Serial/JTAG/OTG/CDC, PHY should enable USB, otherwise USB module When using USB Serial/JTAG/OTG/CDC, PHY should enable USB, otherwise USB module
can not work properly. can not work properly. Notice: Enabling this configuration option will slightly impact wifi performance.
endmenu # PHY endmenu # PHY

12
components/esp_phy/src/phy_init.c
View File

@@ -29,6 +29,10 @@
#include "esp_rom_crc.h" #include "esp_rom_crc.h"
#include "esp_rom_sys.h" #include "esp_rom_sys.h"
#if CONFIG_ESP_PHY_ENABLE_USB
#include "hal/usb_serial_jtag_ll.h"
#endif
#include "soc/rtc_cntl_reg.h" #include "soc/rtc_cntl_reg.h"
#if CONFIG_IDF_TARGET_ESP32C3 #if CONFIG_IDF_TARGET_ESP32C3
#include "soc/syscon_reg.h" #include "soc/syscon_reg.h"
@@ -656,7 +660,13 @@ void esp_phy_load_cal_and_init(void)
#endif #endif
#if CONFIG_ESP_PHY_ENABLE_USB #if CONFIG_ESP_PHY_ENABLE_USB
phy_bbpll_en_usb(true); #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG
if (usb_serial_jtag_ll_txfifo_writable() == 1)
#endif // Only check usb_jtag status with usb_jtag related config options enabled.
{
// If the USB_SEIRAL_JTAG is really in use.
phy_bbpll_en_usb(true);
}
#endif #endif
#ifdef CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE #ifdef CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE