Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(esp_hal_usb): Fix UTMI PHY default settings:

Browse Source 
- Allow automatic UTMI PHY suspend/resume controlled by the DWC2 suspend/resume
    - Correctly set precise detection
This commit is contained in:
peter.marcisovsky
2026-05-20 14:52:43 +02:00
parent 8609249317
commit eac2c21088
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_hal_usb/esp32s31/include/hal/usb_utmi_ll.h
+19 -4
View File
@@ -37,6 +37,22 @@ FORCE_INLINE_ATTR void usb_utmi_ll_configure_ls(usb_utmi_dev_t *hw, bool paralle
/* ----------------------------- RCC Functions ----------------------------- */
/**
* @brief Route UTMI PHY suspendm and PLL control to DWC2
*
* Clears the software force bits so DWC2 can drive PHY suspend/resume and PLL
* during port suspend and internal clock gating.
*
* @note reg_usb_otghs_phy_suspendm_force_en resets to 1 on ESP32-S31 and must be
* cleared before automatic DWC-linked PHY suspend/resume works.
* @note reg_usb_otghs_phy_pll_force_en resets to 0 and is cleared here just for clarity
*/
FORCE_INLINE_ATTR void _usb_utmi_ll_enable_automatic_phy_control(void)
{
HP_ALIVE_SYS.usb_otghs_ctrl.reg_usb_otghs_phy_suspendm_force_en = 0;
HP_ALIVE_SYS.usb_otghs_ctrl.reg_usb_otghs_phy_pll_force_en = 0;
}
/**
* @brief Enable/disable bus clock for USB UTMI PHY and USB OTG HS controller
*
@@ -54,9 +70,9 @@ FORCE_INLINE_ATTR void _usb_utmi_ll_enable_bus_clock(bool clk_en)
sys_usb_otg20_ctrl.sys_usb_otg20_phyref_clk_en = clk_en;
USB_UTMI_LL_CNNT_SYS_REG->sys_usb_otg20_ctrl.val = sys_usb_otg20_ctrl.val;
// Enable/disable PHY PLL (must be force-enabled on ESP32-S31, as the default is off)
HP_ALIVE_SYS.usb_otghs_ctrl.reg_usb_otghs_phy_pll_force_en = clk_en;
HP_ALIVE_SYS.usb_otghs_ctrl.reg_usb_otghs_phy_pll_en = clk_en;
if (clk_en) {
_usb_utmi_ll_enable_automatic_phy_control();
}
}
// HP_SYS_CLKRST.usb_otghs_ctrl0 and sys_usb_otg20_ctrl only contain USB OTG fields, no atomic wrapper needed
@@ -128,7 +144,6 @@ FORCE_INLINE_ATTR void usb_utmi_ll_enable_data_pulldowns(bool enable)
FORCE_INLINE_ATTR void usb_utmi_ll_enable_precise_detection(bool enable)
{
HP_ALIVE_SYS.usb_otghs_ctrl.reg_usb_otghs_phy_otg_suspendm = enable;
HP_ALIVE_SYS.usb_otghs_ctrl.reg_usb_otghs_phy_suspendm = enable;
}
#ifdef __cplusplus