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

esp_phy: fix esp32c3/s3 phy USB & RSSI issue(v4.4)

See merge request espressif/esp-idf!15646
pull/7868/head
Jiang Jiang Jian 2021-10-27 14:01:48 +00:00
commit 7aa3dfc087
4 zmienionych plików z 20 dodań i 1 usunięć

Wyświetl plik

@ -104,4 +104,12 @@ menu "PHY"
help
When brownout reset occurs, reduce PHY TX power to keep the code running.
config ESP_PHY_ENABLE_USB
bool "Enable USB when phy init"
depends on ESP_CONSOLE_USB_SERIAL_JTAG
default y
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.
endmenu # PHY

Wyświetl plik

@ -85,6 +85,13 @@ uint8_t phy_dig_reg_backup(bool backup_en, uint32_t *mem_addr);
void phy_freq_mem_backup(bool backup_en, uint32_t *mem);
#endif
#if CONFIG_ESP_PHY_ENABLE_USB
/**
* @brief Enable or disable USB when phy init.
*/
void phy_bbpll_en_usb(bool en);
#endif
#ifdef __cplusplus
}
#endif

@ -1 +1 @@
Subproject commit 74658eb4fe30e42599a459ef89294010e26d57b6
Subproject commit 7586abbf591ab63d609d7afeb377559deabec808

Wyświetl plik

@ -651,6 +651,10 @@ void esp_phy_load_cal_and_init(void)
}
#endif
#if CONFIG_ESP_PHY_ENABLE_USB
phy_bbpll_en_usb(true);
#endif
#ifdef CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE
esp_phy_calibration_mode_t calibration_mode = PHY_RF_CAL_PARTIAL;
uint8_t sta_mac[6];