Skip to content

Commit 589fa60

Browse files
authored
feat(uart): removes kconfig option to force uart default clk src
1 parent 4279699 commit 589fa60

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

cores/esp32/esp32-hal-uart.c

+2-20
Original file line numberDiff line numberDiff line change
@@ -666,24 +666,16 @@ uart_t *uartBegin(
666666
uart_config.baud_rate = baudrate;
667667
#if SOC_UART_LP_NUM >= 1
668668
if (uart_nr >= SOC_UART_HP_NUM) { // it is a LP UART NUM
669-
#if !(CONFIG_ARDUINO_SERIAL_FORCE_IDF_DEFAULT_CLOCK_SOURCE)
670669
if (uart->_uart_clock_source > 0) {
671670
uart_config.lp_source_clk = (soc_periph_lp_uart_clk_src_t) uart->_uart_clock_source; // use user defined LP UART clock
672671
log_v("Setting UART%d to user defined LP clock source (%d) ", uart_nr, uart->_uart_clock_source);
673-
} else
674-
#endif
675-
{
672+
} else {
676673
uart_config.lp_source_clk = LP_UART_SCLK_DEFAULT; // use default LP clock
677674
log_v("Setting UART%d to Default LP clock source", uart_nr);
678675
}
679676
} else
680677
#endif // SOC_UART_LP_NUM >= 1
681678
{
682-
#if CONFIG_ARDUINO_SERIAL_FORCE_IDF_DEFAULT_CLOCK_SOURCE
683-
// Default CLK Source: CLK_APB for ESP32|S2|S3|C3 -- CLK_PLL_F40M for C2 -- CLK_PLL_F48M for H2 -- CLK_PLL_F80M for C6|P4
684-
uart_config.source_clk = UART_SCLK_DEFAULT; // baudrate may change with the APB Frequency!
685-
log_v("Setting UART%d to use DEFAULT clock", uart_nr);
686-
#else
687679
if (uart->_uart_clock_source >= 0) {
688680
uart_config.source_clk = (soc_module_clk_t) uart->_uart_clock_source; // use user defined HP UART clock
689681
log_v("Setting UART%d to user defined HP clock source (%d) ", uart_nr, uart->_uart_clock_source);
@@ -707,7 +699,6 @@ uart_t *uartBegin(
707699
log_v("Setting UART%d to use DEFAULT clock", uart_nr);
708700
#endif // SOC_UART_SUPPORT_XTAL_CLK
709701
}
710-
#endif // CONFIG_ARDUINO_SERIAL_FORCE_IDF_DEFAULT_CLOCK_SOURCE
711702
}
712703

713704
UART_MUTEX_LOCK();
@@ -1007,24 +998,16 @@ bool uartSetBaudRate(uart_t *uart, uint32_t baud_rate) {
1007998
int8_t previousClkSrc = uart->_uart_clock_source;
1008999
#if SOC_UART_LP_NUM >= 1
10091000
if (uart->num >= SOC_UART_HP_NUM) { // it is a LP UART NUM
1010-
#if !(CONFIG_ARDUINO_SERIAL_FORCE_IDF_DEFAULT_CLOCK_SOURCE)
10111001
if (uart->_uart_clock_source > 0) {
10121002
newClkSrc = (soc_periph_lp_uart_clk_src_t) uart->_uart_clock_source; // use user defined LP UART clock
10131003
log_v("Setting UART%d to user defined LP clock source (%d) ", uart->num, newClkSrc);
1014-
} else
1015-
#endif
1016-
{
1004+
} else {
10171005
newClkSrc = LP_UART_SCLK_DEFAULT; // use default LP clock
10181006
log_v("Setting UART%d to Default LP clock source", uart->num);
10191007
}
10201008
} else
10211009
#endif // SOC_UART_LP_NUM >= 1
10221010
{
1023-
#if CONFIG_ARDUINO_SERIAL_FORCE_IDF_DEFAULT_CLOCK_SOURCE
1024-
// Default CLK Source: CLK_APB for ESP32|S2|S3|C3 -- CLK_PLL_F40M for C2 -- CLK_PLL_F48M for H2 -- CLK_PLL_F80M for C6|P4
1025-
// newClkSrc already set in the variable declaration
1026-
log_v("Setting UART%d to use DEFAULT clock", uart->num);
1027-
#else
10281011
if (uart->_uart_clock_source >= 0) {
10291012
newClkSrc = (soc_module_clk_t) uart->_uart_clock_source; // use user defined HP UART clock
10301013
log_v("Setting UART%d to use HP clock source (%d) ", uart->num, newClkSrc);
@@ -1048,7 +1031,6 @@ bool uartSetBaudRate(uart_t *uart, uint32_t baud_rate) {
10481031
log_v("Setting UART%d to use DEFAULT clock", uart->num);
10491032
#endif // SOC_UART_SUPPORT_XTAL_CLK
10501033
}
1051-
#endif // CONFIG_ARDUINO_SERIAL_FORCE_IDF_DEFAULT_CLOCK_SOURCE
10521034
}
10531035
UART_MUTEX_LOCK();
10541036
// if necessary, set the correct UART Clock Source before changing the baudrate

0 commit comments

Comments
 (0)