Skip to content

Commit

Permalink
Merge branch 'bugfix/uart_bitrate_max_value_c2' into 'master'
Browse files Browse the repository at this point in the history
fix(uart): correct C2 UART_BITRATE_MAX value

See merge request espressif/esp-idf!29795
  • Loading branch information
songruo committed Mar 25, 2024
2 parents f886bbc + 3da77e2 commit 6f9a866
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion components/soc/esp32c2/include/soc/Kconfig.soc_caps.in
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ config SOC_UART_FIFO_LEN

config SOC_UART_BITRATE_MAX
int
default 5000000
default 2500000

config SOC_UART_SUPPORT_WAKEUP_INT
bool
Expand Down
5 changes: 2 additions & 3 deletions components/soc/esp32c2/include/soc/clk_tree_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,6 @@ typedef enum {
UART_SCLK_DEFAULT = SOC_MOD_CLK_PLL_F40M, /*!< UART source clock default choice is PLL_F40M */
} soc_periph_uart_clk_src_legacy_t;

/////////////////////////////////////////////////I2C////////////////////////////////////////////////////////////////////


/////////////////////////////////////////////////SPI////////////////////////////////////////////////////////////////////

/**
Expand All @@ -221,6 +218,8 @@ typedef enum {
SPI_CLK_SRC_XTAL = SOC_MOD_CLK_XTAL, /*!< Select XTAL as SPI source clock */
} soc_periph_spi_clk_src_t;

/////////////////////////////////////////////////I2C////////////////////////////////////////////////////////////////////

/**
* @brief Array initializer for all supported clock sources of I2C
*/
Expand Down
2 changes: 1 addition & 1 deletion components/soc/esp32c2/include/soc/soc_caps.h
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@
#define SOC_UART_NUM (2)
#define SOC_UART_HP_NUM (2)
#define SOC_UART_FIFO_LEN (128) /*!< The UART hardware FIFO length */
#define SOC_UART_BITRATE_MAX (5000000) /*!< Max bit rate supported by UART */
#define SOC_UART_BITRATE_MAX (2500000) /*!< Max bit rate supported by UART */
#define SOC_UART_SUPPORT_WAKEUP_INT (1) /*!< Support UART wakeup interrupt */
#define SOC_UART_SUPPORT_PLL_F40M_CLK (1) /*!< Support APB as the clock source */
#define SOC_UART_SUPPORT_RTC_CLK (1) /*!< Support RTC clock as the clock source */
Expand Down

0 comments on commit 6f9a866

Please sign in to comment.