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/esp_periph_uart_clk_gate_issue_v4.3' into 'release/v4.3'

Browse Source 
esp_system: use ESP_CONSOLE_UART_NUM instead of CONSOLE_UART_NUM (backport to v4.3)

See merge request espressif/esp-idf!21284
This commit is contained in:
Jiang Jiang Jian 2022-11-30 17:30:42 +08:00
commit 6b48dd30e6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_system/port/soc/esp32c3/clk.c
View File

@ -266,10 +266,10 @@ __attribute__((weak)) void esp_perip_clk_init(void)
//Reset the communication peripherals like I2C, SPI, UART, I2S and bring them to known state. //Reset the communication peripherals like I2C, SPI, UART, I2S and bring them to known state.
common_perip_clk |= SYSTEM_I2S0_CLK_EN | common_perip_clk |= SYSTEM_I2S0_CLK_EN |
#if CONFIG_CONSOLE_UART_NUM != 0 #if CONFIG_ESP_CONSOLE_UART_NUM != 0
SYSTEM_UART_CLK_EN | SYSTEM_UART_CLK_EN |
#endif #endif
#if CONFIG_CONSOLE_UART_NUM != 1 #if CONFIG_ESP_CONSOLE_UART_NUM != 1
SYSTEM_UART1_CLK_EN | SYSTEM_UART1_CLK_EN |
#endif #endif
SYSTEM_SPI2_CLK_EN | SYSTEM_SPI2_CLK_EN |

6
components/esp_system/port/soc/esp32s3/clk.c
View File

@ -269,13 +269,13 @@ __attribute__((weak)) void esp_perip_clk_init(void)
//Reset the communication peripherals like I2C, SPI, UART, I2S and bring them to known state. //Reset the communication peripherals like I2C, SPI, UART, I2S and bring them to known state.
common_perip_clk |= SYSTEM_I2S0_CLK_EN | common_perip_clk |= SYSTEM_I2S0_CLK_EN |
#if CONFIG_CONSOLE_UART_NUM != 0 #if CONFIG_ESP_CONSOLE_UART_NUM != 0
SYSTEM_UART_CLK_EN | SYSTEM_UART_CLK_EN |
#endif #endif
#if CONFIG_CONSOLE_UART_NUM != 1 #if CONFIG_ESP_CONSOLE_UART_NUM != 1
SYSTEM_UART1_CLK_EN | SYSTEM_UART1_CLK_EN |
#endif #endif
#if CONFIG_CONSOLE_UART_NUM != 2 #if CONFIG_ESP_CONSOLE_UART_NUM != 2
SYSTEM_UART2_CLK_EN | SYSTEM_UART2_CLK_EN |
#endif #endif
SYSTEM_USB_CLK_EN | SYSTEM_USB_CLK_EN |