From 00793592eb93a471bdbd5d6694935019be3a0de9 Mon Sep 17 00:00:00 2001
From: Daniel DeGrasse <daniel.degrasse@nxp.com>
Date: Mon, 14 Mar 2022 12:18:52 -0500
Subject: [PATCH] drivers: serial: Enable pinctrl for kinetis lpsci driver

Enable pinctrl for kinetis lpsci uart driver

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
---
 drivers/serial/uart_mcux_lpsci.c           | 10 ++++++++++
 dts/bindings/serial/nxp,kinetis-lpsci.yaml |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/serial/uart_mcux_lpsci.c b/drivers/serial/uart_mcux_lpsci.c
index cab60ca1f77..8aa4bd3d0c3 100644
--- a/drivers/serial/uart_mcux_lpsci.c
+++ b/drivers/serial/uart_mcux_lpsci.c
@@ -10,6 +10,7 @@
 #include <device.h>
 #include <drivers/uart.h>
 #include <drivers/clock_control.h>
+#include <drivers/pinctrl.h>
 #include <fsl_lpsci.h>
 #include <soc.h>
 
@@ -21,6 +22,7 @@ struct mcux_lpsci_config {
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	void (*irq_config_func)(const struct device *dev);
 #endif
+	const struct pinctrl_dev_config *pincfg;
 };
 
 struct mcux_lpsci_data {
@@ -237,6 +239,7 @@ static int mcux_lpsci_init(const struct device *dev)
 	const struct mcux_lpsci_config *config = dev->config;
 	lpsci_config_t uart_config;
 	uint32_t clock_freq;
+	int err;
 
 	if (clock_control_get_rate(config->clock_dev, config->clock_subsys,
 				   &clock_freq)) {
@@ -250,6 +253,11 @@ static int mcux_lpsci_init(const struct device *dev)
 
 	LPSCI_Init(config->base, &uart_config, clock_freq);
 
+	err = pinctrl_apply_state(config->pincfg, PINCTRL_STATE_DEFAULT);
+	if (err < 0) {
+		return err;
+	}
+
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	config->irq_config_func(dev);
 #endif
@@ -306,10 +314,12 @@ static const struct mcux_lpsci_config mcux_lpsci_##n##_config = {	\
 	.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(n)),		\
 	.clock_subsys = (clock_control_subsys_t)DT_INST_CLOCKS_CELL(n, name),\
 	.baud_rate = DT_INST_PROP(n, current_speed),			\
+	.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),			\
 	IRQ_FUNC_INIT							\
 }
 
 #define MCUX_LPSCI_INIT(n)						\
+	PINCTRL_DT_INST_DEFINE(n);					\
 									\
 	static struct mcux_lpsci_data mcux_lpsci_##n##_data;		\
 									\
diff --git a/dts/bindings/serial/nxp,kinetis-lpsci.yaml b/dts/bindings/serial/nxp,kinetis-lpsci.yaml
index d74ec03f09d..0105da9efc5 100644
--- a/dts/bindings/serial/nxp,kinetis-lpsci.yaml
+++ b/dts/bindings/serial/nxp,kinetis-lpsci.yaml
@@ -2,7 +2,7 @@ description: Kinetis LPSCI UART
 
 compatible: "nxp,kinetis-lpsci"
 
-include: uart-controller.yaml
+include: [uart-controller.yaml, pinctrl-device.yaml]
 
 properties:
     reg: