drivers: serial: RCar add pinctrl support

Get pin configuration from device tree to set alternate pin function. Signed-off-by: Aymeric Aillet <[email protected]>
phan-uy-vu · Jan 18, 2022 · 37f5fe5 · 37f5fe5
1 parent 873607c
commit 37f5fe5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/drivers/serial/uart_rcar.c b/drivers/serial/uart_rcar.c
@@ -12,13 +12,15 @@
 #include <drivers/uart.h>
 #include <drivers/clock_control.h>
 #include <drivers/clock_control/rcar_clock_control.h>
+#include <drivers/pinctrl.h>
 #include <spinlock.h>
 
 struct uart_rcar_cfg {
 	uint32_t reg_addr;
 	const struct device *clock_dev;
 	struct rcar_cpg_clk mod_clk;
 	struct rcar_cpg_clk bus_clk;
+	const struct pinctrl_dev_config *pcfg;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	void (*irq_config_func)(const struct device *dev);
 #endif
@@ -271,6 +273,12 @@ static int uart_rcar_init(const struct device *dev)
 	struct uart_rcar_data *data = DEV_UART_DATA(dev);
 	int ret;
 
+	/* Configure dt provided device signals when available */
+	ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
+	if (ret < 0) {
+		return ret;
+	}
+
 	ret = clock_control_on(config->clock_dev,
 			       (clock_control_subsys_t *)&config->mod_clk);
 	if (ret < 0) {
@@ -527,6 +535,7 @@ static const struct uart_driver_api uart_rcar_driver_api = {
 
 /* Device Instantiation */
 #define UART_RCAR_DECLARE_CFG(n, IRQ_FUNC_INIT)			    \
+	PINCTRL_DT_INST_DEFINE(n);				    \
 	static const struct uart_rcar_cfg uart_rcar_cfg_##n = {	    \
 		.reg_addr = DT_INST_REG_ADDR(n),		    \
 		.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(n)), \
@@ -538,6 +547,7 @@ static const struct uart_driver_api uart_rcar_driver_api = {
 			DT_INST_CLOCKS_CELL_BY_IDX(n, 1, module),   \
 		.bus_clk.domain =				    \
 			DT_INST_CLOCKS_CELL_BY_IDX(n, 1, domain),   \
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),	    \
 		IRQ_FUNC_INIT					    \
 	}
 

diff --git a/dts/bindings/serial/renesas,rcar-scif.yaml b/dts/bindings/serial/renesas,rcar-scif.yaml
@@ -5,7 +5,7 @@ description: Renesas R-Car UART controller
 
 compatible: "renesas,rcar-scif"
 
-include: uart-controller.yaml
+include: [uart-controller.yaml, pinctrl-device.yaml]
 
 properties:
     reg: