drivers: nrf: Add UART and UARTE configure function.

Add UART configure function for UART and UARTE shims.

Signed-off-by: Mieszko Mierunski <[email protected]>

Author: Mierunski

drivers/serial/uart_nrfx_uart.c

@@ -16,6 +16,28 @@
 static NRF_UART_Type *const uart0_addr =
 		(NRF_UART_Type *)DT_NORDIC_NRF_UART_UART_0_BASE_ADDRESS;
 
+/* Device data structure */
+struct uart_nrfx_data {
+	struct uart_config uart_config;
+};
+
+/**
+ * @brief Structure for UART configuration.
+ */
+struct uart_nrfx_config {
+	bool rts_cts_pins_set;
+};
+
+static inline struct uart_nrfx_data *get_dev_data(struct device *dev)
+{
+	return dev->driver_data;
+}
+
+static inline const struct uart_nrfx_config *get_dev_config(struct device *dev)
+{
+	return dev->config->config_info;
+}
+
 #ifdef CONFIG_UART_0_INTERRUPT_DRIVEN
 
 static uart_irq_callback_user_data_t irq_callback; /**< Callback function pointer */
@@ -216,6 +238,62 @@ static int uart_nrfx_err_check(struct device *dev)
 	return error;
 }
 
+static int uart_nrfx_configure(struct device *dev,
+			       const struct uart_config *cfg)
+{
+	nrf_uart_parity_t parity;
+	nrf_uart_hwfc_t hwfc;
+
+	if (cfg->stop_bits != UART_CFG_STOP_BITS_1) {
+		return -ENOTSUP;
+	}
+
+	if (cfg->data_bits != UART_CFG_DATA_BITS_8) {
+		return -ENOTSUP;
+	}
+
+	switch (cfg->flow_ctrl) {
+	case UART_CFG_FLOW_CTRL_NONE:
+		hwfc = NRF_UART_HWFC_DISABLED;
+		break;
+	case UART_CFG_FLOW_CTRL_RTS_CTS:
+		if (get_dev_config(dev)->rts_cts_pins_set) {
+			hwfc = NRF_UART_HWFC_ENABLED;
+		} else {
+			return -ENOTSUP;
+		}
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	switch (cfg->parity) {
+	case UART_CFG_PARITY_NONE:
+		parity = NRF_UART_PARITY_EXCLUDED;
+		break;
+	case UART_CFG_PARITY_EVEN:
+		parity = NRF_UART_PARITY_INCLUDED;
+		break;
+	default:
+		return -ENOTSUP;
+	}
+
+	if (baudrate_set(dev, cfg->baudrate) != 0) {
+		return -ENOTSUP;
+	}
+
+	nrf_uart_configure(uart0_addr, parity, hwfc);
+
+	get_dev_data(dev)->uart_config = *cfg;
+
+	return 0;
+}
+
+static int uart_nrfx_config_get(struct device *dev, struct uart_config *cfg)
+{
+	*cfg = get_dev_data(dev)->uart_config;
+	return 0;
+}
 
 #ifdef CONFIG_UART_0_INTERRUPT_DRIVEN
 
@@ -414,14 +492,8 @@ static int uart_nrfx_init(struct device *dev)
 	nrf_uart_txrx_pins_set(uart0_addr,
 			       DT_NORDIC_NRF_UART_UART_0_TX_PIN,
 			       DT_NORDIC_NRF_UART_UART_0_RX_PIN);
-
-#ifdef CONFIG_UART_0_NRF_FLOW_CONTROL
-#ifndef DT_NORDIC_NRF_UART_UART_0_RTS_PIN
-#error Flow control for UART0 is enabled, but RTS pin is not defined.
-#endif
-#ifndef DT_NORDIC_NRF_UART_UART_0_CTS_PIN
-#error Flow control for UART0 is enabled, but CTS pin is not defined.
-#endif
+#if	defined(DT_NORDIC_NRF_UART_UART_0_RTS_PIN) && \
+	defined(DT_NORDIC_NRF_UART_UART_0_CTS_PIN)
 	/* Setting default height state of the RTS PIN to avoid glitches
 	 * on the line during peripheral activation/deactivation.
 	 */
@@ -434,22 +506,10 @@ static int uart_nrfx_init(struct device *dev)
 	nrf_uart_hwfc_pins_set(uart0_addr,
 			       DT_NORDIC_NRF_UART_UART_0_RTS_PIN,
 			       DT_NORDIC_NRF_UART_UART_0_CTS_PIN);
-#endif /* CONFIG_UART_0_NRF_FLOW_CONTROL */
-
-	nrf_uart_configure(uart0_addr,
-#ifdef CONFIG_UART_0_NRF_PARITY_BIT
-			   NRF_UART_PARITY_INCLUDED,
-#else
-			   NRF_UART_PARITY_EXCLUDED,
-#endif /* CONFIG_UART_0_NRF_PARITY_BIT */
-#ifdef CONFIG_UART_0_NRF_FLOW_CONTROL
-			   NRF_UART_HWFC_ENABLED);
-#else
-			   NRF_UART_HWFC_DISABLED);
-#endif /* CONFIG_UART_0_NRF_PARITY_BIT */
+#endif
 
-	/* Set baud rate */
-	err = baudrate_set(dev, DT_NORDIC_NRF_UART_UART_0_CURRENT_SPEED);
+	/* Set initial configuration */
+	err = uart_nrfx_configure(dev, &get_dev_data(dev)->uart_config);
 	if (err) {
 		return err;
 	}
@@ -488,6 +548,8 @@ static const struct uart_driver_api uart_nrfx_uart_driver_api = {
 	.poll_in          = uart_nrfx_poll_in,
 	.poll_out         = uart_nrfx_poll_out,
 	.err_check        = uart_nrfx_err_check,
+	.configure        = uart_nrfx_configure,
+	.config_get       = uart_nrfx_config_get,
 #ifdef CONFIG_UART_0_INTERRUPT_DRIVEN
 	.fifo_fill        = uart_nrfx_fifo_fill,
 	.fifo_read        = uart_nrfx_fifo_read,
@@ -542,12 +604,39 @@ static int uart_nrfx_pm_control(struct device *dev,
 }
 #endif /* CONFIG_DEVICE_POWER_MANAGEMENT */
 
+static struct uart_nrfx_data uart_nrfx_uart0_data = {
+	.uart_config = {
+		.stop_bits = UART_CFG_STOP_BITS_1,
+		.data_bits = UART_CFG_DATA_BITS_8,
+		.baudrate  = DT_NORDIC_NRF_UART_UART_0_CURRENT_SPEED,
+#ifdef CONFIG_UART_0_NRF_PARITY_BIT
+		.parity    = UART_CFG_PARITY_EVEN,
+#else
+		.parity    = UART_CFG_PARITY_NONE,
+#endif /* CONFIG_UART_0_NRF_PARITY_BIT */
+#ifdef CONFIG_UART_0_NRF_FLOW_CONTROL
+		.flow_ctrl = UART_CFG_FLOW_CTRL_RTS_CTS,
+#else
+		.flow_ctrl = UART_CFG_FLOW_CTRL_NONE,
+#endif /* CONFIG_UART_0_NRF_FLOW_CONTROL */
+	}
+};
+
+static const struct uart_nrfx_config uart_nrfx_uart0_config = {
+#if	defined(DT_NORDIC_NRF_UART_UART_0_RTS_PIN) && \
+	defined(DT_NORDIC_NRF_UART_UART_0_CTS_PIN)
+	.rts_cts_pins_set = true,
+#else
+	.rts_cts_pins_set = false,
+#endif
+};
+
 DEVICE_DEFINE(uart_nrfx_uart0,
 	      DT_NORDIC_NRF_UART_UART_0_LABEL,
 	      uart_nrfx_init,
 	      uart_nrfx_pm_control,
-	      NULL,
-	      NULL,
+	      &uart_nrfx_uart0_data,
+	      &uart_nrfx_uart0_config,
 	      /* Initialize UART device before UART console. */
 	      PRE_KERNEL_1,
 	      CONFIG_KERNEL_INIT_PRIORITY_DEVICE,