mirror/tinyusb
3
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2026-03-30 03:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Dolphindalt/tinyusb

Browse Source
This commit is contained in:
Dalton Caron
2025-09-11 09:15:16 -07:00
parent af7310b925 5e661eac88
commit a20252ad59
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hw/bsp/stm32wba/family.mk
View File

@ -55,4 +55,4 @@ LD_FILE_GCC ?= ${ST_CMSIS}/Source/Templates/gcc/linker/${UPPERCASE_MCU_VARIANT}_
LD_FILE_IAR ?= $(ST_CMSIS)/Source/Templates/iar/linker/$(MCU_VARIANT)_flash_ns.icf
# flash target using on-board stlink
flash: flash-stlink
flash: flash-stlink

24
src/portable/synopsys/dwc2/dwc2_common.c
View File

@ -95,6 +95,14 @@ static void phy_hs_init(dwc2_regs_t* dwc2) {
const dwc2_ghwcfg2_t ghwcfg2 = {.value = dwc2->ghwcfg2};
const dwc2_ghwcfg4_t ghwcfg4 = {.value = dwc2->ghwcfg4};
uint8_t phy_width;
if (CFG_TUSB_MCU != OPT_MCU_AT32F402_405 && // at32f402_405 does not support 16-bit
ghwcfg4.phy_data_width) {
phy_width = 16; // 16-bit PHY interface if supported
} else {
phy_width = 8; // 8-bit PHY interface
}
// De-select FS PHY
gusbcfg &= ~GUSBCFG_PHYSEL;
@ -122,12 +130,10 @@ static void phy_hs_init(dwc2_regs_t* dwc2) {
gusbcfg &= ~GUSBCFG_ULPI_UTMI_SEL;
// Set 16-bit interface if supported
if (ghwcfg4.phy_data_width) {
#if CFG_TUSB_MCU != OPT_MCU_AT32F402_405 // at32f402_405 does not actually support 16-bit
gusbcfg |= GUSBCFG_PHYIF16; // 16 bit
#endif
if (phy_width == 16) {
gusbcfg |= GUSBCFG_PHYIF16;
} else {
gusbcfg &= ~GUSBCFG_PHYIF16; // 8 bit
gusbcfg &= ~GUSBCFG_PHYIF16;
}
}
@ -144,13 +150,7 @@ static void phy_hs_init(dwc2_regs_t* dwc2) {
// - 9 if using 8-bit PHY interface
// - 5 if using 16-bit PHY interface
gusbcfg &= ~GUSBCFG_TRDT_Msk;
#if CFG_TUSB_MCU == OPT_MCU_AT32F402_405 // at32f402_405 does not actually support 16-bit
gusbcfg |= 9u << GUSBCFG_TRDT_Pos;
#else
gusbcfg |= (dwc2->ghwcfg4_bm.phy_data_width ? 5u : 9u) << GUSBCFG_TRDT_Pos;
#endif
gusbcfg |= (phy_width == 16 ? 5u : 9u) << GUSBCFG_TRDT_Pos;
dwc2->gusbcfg = gusbcfg;
// MCU specific PHY update post reset