alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/remove_usb_check' into 'master'

Browse Source 
usb_serial_jtag: remove the strict condition check in esp_phy

See merge request espressif/esp-idf!16857
This commit is contained in:
Simon 2022-01-20 10:48:33 +00:00
commit e04d4ac2b5
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,10 +29,6 @@
#include "esp_rom_crc.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"
#if CONFIG_IDF_TARGET_ESP32C3
#include "soc/syscon_reg.h"
@ -660,13 +656,7 @@ void esp_phy_load_cal_and_init(void)
#endif
#if CONFIG_ESP_PHY_ENABLE_USB
#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);
}
phy_bbpll_en_usb(true);
#endif
#ifdef CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE