michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: serial: stm32: Refactor for PM handling

Browse source 
Move clock enable and register configuration to their own functions in
preparation for later uart_stm32_reinit function that will use these in
addition to uart_stm32_init.

Signed-off-by: Kenneth J. Miller <ken@miller.ec>
This commit is contained in:
Kenneth J. Miller 2023-06-20 01:28:09 +02:00 • committed by Carles Cufí
commit 31a6e31cee
1 changed files with 45 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

62
drivers/serial/uart_stm32.c
View file

@ -1805,23 +1805,10 @@ static const struct uart_driver_api uart_stm32_driver_api = {
#endif /* CONFIG_UART_ASYNC_API */ #endif /* CONFIG_UART_ASYNC_API */
}; };
/** static int uart_stm32_clocks_enable(const struct device *dev)
* @brief Initialize UART channel
*
* This routine is called to reset the chip in a quiescent state.
* It is assumed that this function is called only once per UART.
*
* @param dev UART device struct
*
* @return 0
*/
static int uart_stm32_init(const struct device *dev)
{ {
const struct uart_stm32_config *config = dev->config; const struct uart_stm32_config *config = dev->config;
struct uart_stm32_data *data = dev->data; struct uart_stm32_data *data = dev->data;
struct uart_config *uart_cfg = data->uart_cfg;
uint32_t ll_parity;
uint32_t ll_datawidth;
int err; int err;
__uart_stm32_get_clock(dev); __uart_stm32_get_clock(dev);
@ -1848,12 +1835,17 @@ static int uart_stm32_init(const struct device *dev)
} }
} }
/* Configure dt provided device signals when available */ return 0;
err = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
if (err < 0) {
return err;
} }
static int uart_stm32_registers_configure(const struct device *dev)
{
const struct uart_stm32_config *config = dev->config;
struct uart_stm32_data *data = dev->data;
struct uart_config *uart_cfg = data->uart_cfg;
uint32_t ll_parity;
uint32_t ll_datawidth;
LL_USART_Disable(config->usart); LL_USART_Disable(config->usart);
if (!device_is_ready(config->reset.dev)) { if (!device_is_ready(config->reset.dev)) {
@ -1956,6 +1948,40 @@ static int uart_stm32_init(const struct device *dev)
} }
#endif /* !USART_ISR_REACK */ #endif /* !USART_ISR_REACK */
return 0;
}
/**
* @brief Initialize UART channel
*
* This routine is called to reset the chip in a quiescent state.
* It is assumed that this function is called only once per UART.
*
* @param dev UART device struct
*
* @return 0
*/
static int uart_stm32_init(const struct device *dev)
{
const struct uart_stm32_config *config = dev->config;
int err;
err = uart_stm32_clocks_enable(dev);
if (err < 0) {
return err;
}
/* Configure dt provided device signals when available */
err = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
if (err < 0) {
return err;
}
err = uart_stm32_registers_configure(dev);
if (err < 0) {
return err;
}
#if defined(CONFIG_PM) || \ #if defined(CONFIG_PM) || \
defined(CONFIG_UART_INTERRUPT_DRIVEN) || \ defined(CONFIG_UART_INTERRUPT_DRIVEN) || \
defined(CONFIG_UART_ASYNC_API) defined(CONFIG_UART_ASYNC_API)