espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
esp_system: use ESP_CONSOLE_UART_NUM instead of CONSOLE_UART_NUM

See merge request espressif/esp-idf!20942
This commit is contained in:
Jiang Jiang Jian
2022-11-09 17:59:07 +08:00
parent 770b787072 d6c783d02d
commit 6b5f53dcc2
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,10 +215,10 @@ __attribute__((weak)) void esp_perip_clk_init(void)
} else { } else {
common_perip_clk = SYSTEM_WDG_CLK_EN | common_perip_clk = SYSTEM_WDG_CLK_EN |
SYSTEM_I2S0_CLK_EN | 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 |
@ -246,10 +246,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 |

8
components/esp_system/port/soc/esp32h2/clk.c
View File

@ -208,10 +208,10 @@ __attribute__((weak)) void esp_perip_clk_init(void)
} else { } else {
common_perip_clk = SYSTEM_WDG_CLK_EN | common_perip_clk = SYSTEM_WDG_CLK_EN |
SYSTEM_I2S0_CLK_EN | 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 |
@ -235,10 +235,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 |

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

@ -227,13 +227,13 @@ __attribute__((weak)) void esp_perip_clk_init(void)
} else { } else {
common_perip_clk = SYSTEM_WDG_CLK_EN | common_perip_clk = SYSTEM_WDG_CLK_EN |
SYSTEM_I2S0_CLK_EN | 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 |
@ -267,13 +267,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 |