feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/usb_hal_and_clk' into 'master'

Browse Source 
Fix USB CLK always reset and USB with swapped pins not working through HAL

See merge request espressif/esp-idf!10113
This commit is contained in:
Angus Gratton
2020-08-26 07:39:03 +08:00
parent 948a86ec7b 0aa1c13027
commit cf3be75844
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/esp_system/port/esp32s2/clk.c
View File

@@ -233,7 +233,6 @@ void esp_perip_clk_init(void)
#if CONFIG_ESP_CONSOLE_UART_NUM != 1
DPORT_UART1_CLK_EN |
#endif
DPORT_USB_CLK_EN |
DPORT_SPI2_CLK_EN |
DPORT_I2C_EXT0_CLK_EN |
DPORT_UHCI0_CLK_EN |

1
components/soc/src/esp32s2/usb_hal.c
View File

@@ -22,6 +22,5 @@ void usb_hal_init(usb_hal_context_t *usb)
usb_ll_ext_phy_enable();
} else {
usb_ll_int_phy_enable();
usb_ll_int_phy_pullup_conf(true, false, false, false);
}
}