michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: serial: Add pinctrl support to usart flexcomm driver

Browse source 
Add pinctrl support to LPC USART flexcomm driver

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
This commit is contained in:
Daniel DeGrasse 2022-03-04 14:32:18 -06:00 • committed by Marti Bolivar
commit 58008b3085
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

26
drivers/serial/uart_mcux_flexcomm.c
View file

@ -21,6 +21,9 @@
#include <fsl_usart.h> #include <fsl_usart.h>
#include <soc.h> #include <soc.h>
#include <fsl_device_registers.h> #include <fsl_device_registers.h>
#ifdef CONFIG_PINCTRL
#include <drivers/pinctrl.h>
#endif
struct mcux_flexcomm_config { struct mcux_flexcomm_config {
USART_Type *base; USART_Type *base;
@ -31,6 +34,9 @@ struct mcux_flexcomm_config {
#ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CONFIG_UART_INTERRUPT_DRIVEN
void (*irq_config_func)(const struct device *dev); void (*irq_config_func)(const struct device *dev);
#endif #endif
#ifdef CONFIG_PINCTRL
const struct pinctrl_dev_config *pincfg;
#endif
}; };
struct mcux_flexcomm_data { struct mcux_flexcomm_data {
@ -250,6 +256,14 @@ static int mcux_flexcomm_init(const struct device *dev)
usart_config_t usart_config; usart_config_t usart_config;
usart_parity_mode_t parity_mode; usart_parity_mode_t parity_mode;
uint32_t clock_freq; uint32_t clock_freq;
#ifdef CONFIG_PINCTRL
int err;
err = pinctrl_apply_state(config->pincfg, PINCTRL_STATE_DEFAULT);
if (err) {
return err;
}
#endif /* CONFIG_PINCTRL */
/* Get the clock frequency */ /* Get the clock frequency */
if (clock_control_get_rate(config->clock_dev, config->clock_subsys, if (clock_control_get_rate(config->clock_dev, config->clock_subsys,
@ -325,6 +339,15 @@ static const struct uart_driver_api mcux_flexcomm_driver_api = {
UART_MCUX_FLEXCOMM_DECLARE_CFG(n, UART_MCUX_FLEXCOMM_IRQ_CFG_FUNC_INIT) UART_MCUX_FLEXCOMM_DECLARE_CFG(n, UART_MCUX_FLEXCOMM_IRQ_CFG_FUNC_INIT)
#endif #endif
#ifdef CONFIG_PINCTRL
#define UART_MCUX_FLEXCOMM_PINCTRL_DEFINE(n) PINCTRL_DT_INST_DEFINE(n)
#define UART_MCUX_FLEXCOMM_PINCTRL_INIT(n) .pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),
#else
#define UART_MCUX_FLEXCOMM_PINCTRL_DEFINE(n)
#define UART_MCUX_FLEXCOMM_PINCTRL_INIT(n)
#endif
#define UART_MCUX_FLEXCOMM_DECLARE_CFG(n, IRQ_FUNC_INIT) \ #define UART_MCUX_FLEXCOMM_DECLARE_CFG(n, IRQ_FUNC_INIT) \
static const struct mcux_flexcomm_config mcux_flexcomm_##n##_config = { \ static const struct mcux_flexcomm_config mcux_flexcomm_##n##_config = { \
.base = (USART_Type *)DT_INST_REG_ADDR(n), \ .base = (USART_Type *)DT_INST_REG_ADDR(n), \
@ -333,11 +356,14 @@ static const struct mcux_flexcomm_config mcux_flexcomm_##n##_config = { \
(clock_control_subsys_t)DT_INST_CLOCKS_CELL(n, name),\ (clock_control_subsys_t)DT_INST_CLOCKS_CELL(n, name),\
.baud_rate = DT_INST_PROP(n, current_speed), \ .baud_rate = DT_INST_PROP(n, current_speed), \
.parity = DT_INST_ENUM_IDX_OR(n, parity, UART_CFG_PARITY_NONE), \ .parity = DT_INST_ENUM_IDX_OR(n, parity, UART_CFG_PARITY_NONE), \
UART_MCUX_FLEXCOMM_PINCTRL_INIT(n) \
IRQ_FUNC_INIT \ IRQ_FUNC_INIT \
} }
#define UART_MCUX_FLEXCOMM_INIT(n) \ #define UART_MCUX_FLEXCOMM_INIT(n) \
\ \
UART_MCUX_FLEXCOMM_PINCTRL_DEFINE(n); \
\
static struct mcux_flexcomm_data mcux_flexcomm_##n##_data; \ static struct mcux_flexcomm_data mcux_flexcomm_##n##_data; \
\ \
static const struct mcux_flexcomm_config mcux_flexcomm_##n##_config;\ static const struct mcux_flexcomm_config mcux_flexcomm_##n##_config;\

2
dts/bindings/arm/nxp,lpc-flexcomm.yaml
View file

@ -5,7 +5,7 @@ description: LPC Flexcomm node
compatible: "nxp,lpc-flexcomm" compatible: "nxp,lpc-flexcomm"
include: base.yaml include: [base.yaml, pinctrl-device.yaml]
properties: properties:
reg: reg: