From 31a6e31cee4682ce6065fb49bab749b9b9d9c047 Mon Sep 17 00:00:00 2001
From: "Kenneth J. Miller" <ken@miller.ec>
Date: Tue, 20 Jun 2023 01:28:09 +0200
Subject: [PATCH] drivers: serial: stm32: Refactor for PM handling

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>
---
 drivers/serial/uart_stm32.c | 64 ++++++++++++++++++++++++++-----------
 1 file changed, 45 insertions(+), 19 deletions(-)

diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c
index 6c8cc43d213..e49098d338e 100644
--- a/drivers/serial/uart_stm32.c
+++ b/drivers/serial/uart_stm32.c
@@ -1805,23 +1805,10 @@ static const struct uart_driver_api uart_stm32_driver_api = {
 #endif /* CONFIG_UART_ASYNC_API */
 };
 
-/**
- * @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)
+static int uart_stm32_clocks_enable(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;
 	int err;
 
 	__uart_stm32_get_clock(dev);
@@ -1848,11 +1835,16 @@ static int uart_stm32_init(const struct device *dev)
 		}
 	}
 
-	/* Configure dt provided device signals when available */
-	err = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
-	if (err < 0) {
-		return err;
-	}
+	return 0;
+}
+
+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);
 
@@ -1956,6 +1948,40 @@ static int uart_stm32_init(const struct device *dev)
 	}
 #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) || \
 	defined(CONFIG_UART_INTERRUPT_DRIVEN) || \
 	defined(CONFIG_UART_ASYNC_API)