michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: serial: rv32m1: lpuart: add pinctrl support

Browse source 
Add pinctrl support to the OpenISA RV32M1 LPUART serial driver.

Signed-off-by: Henrik Brix Andersen <henrik@brixandersen.dk>
This commit is contained in:
Henrik Brix Andersen 2022-05-01 22:32:33 +02:00 • committed by David Leach
commit 738e9f57f9
2 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

27
drivers/serial/uart_rv32m1_lpuart.c
View file

@ -13,6 +13,9 @@
#include <drivers/clock_control.h> #include <drivers/clock_control.h>
#include <fsl_lpuart.h> #include <fsl_lpuart.h>
#include <soc.h> #include <soc.h>
#ifdef CONFIG_PINCTRL
#include <drivers/pinctrl.h>
#endif
struct rv32m1_lpuart_config { struct rv32m1_lpuart_config {
LPUART_Type *base; LPUART_Type *base;
@ -25,6 +28,9 @@ struct rv32m1_lpuart_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 rv32m1_lpuart_data { struct rv32m1_lpuart_data {
@ -240,6 +246,9 @@ static int rv32m1_lpuart_init(const struct device *dev)
const struct rv32m1_lpuart_config *config = dev->config; const struct rv32m1_lpuart_config *config = dev->config;
lpuart_config_t uart_config; lpuart_config_t uart_config;
uint32_t clock_freq; uint32_t clock_freq;
#ifdef CONFIG_PINCTRL
int err;
#endif
/* set clock source */ /* set clock source */
/* TODO: Don't change if another core has configured */ /* TODO: Don't change if another core has configured */
@ -261,6 +270,13 @@ static int rv32m1_lpuart_init(const struct device *dev)
LPUART_Init(config->base, &uart_config, clock_freq); LPUART_Init(config->base, &uart_config, clock_freq);
#ifdef CONFIG_PINCTRL
err = pinctrl_apply_state(config->pincfg, PINCTRL_STATE_DEFAULT);
if (err != 0) {
return err;
}
#endif
#ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CONFIG_UART_INTERRUPT_DRIVEN
config->irq_config_func(dev); config->irq_config_func(dev);
#endif #endif
@ -290,6 +306,14 @@ static const struct uart_driver_api rv32m1_lpuart_driver_api = {
#endif #endif
}; };
#ifdef CONFIG_PINCTRL
#define PINCTRL_INIT(n) .pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),
#define PINCTRL_DEFINE(n) PINCTRL_DT_INST_DEFINE(n);
#else
#define PINCTRL_DEFINE(n)
#define PINCTRL_INIT(n)
#endif
#define RV32M1_LPUART_DECLARE_CFG(n, IRQ_FUNC_INIT) \ #define RV32M1_LPUART_DECLARE_CFG(n, IRQ_FUNC_INIT) \
static const struct rv32m1_lpuart_config rv32m1_lpuart_##n##_cfg = {\ static const struct rv32m1_lpuart_config rv32m1_lpuart_##n##_cfg = {\
.base = (LPUART_Type *)DT_INST_REG_ADDR(n), \ .base = (LPUART_Type *)DT_INST_REG_ADDR(n), \
@ -300,6 +324,7 @@ static const struct uart_driver_api rv32m1_lpuart_driver_api = {
.clock_ip_src = kCLOCK_IpSrcFircAsync, \ .clock_ip_src = kCLOCK_IpSrcFircAsync, \
.baud_rate = DT_INST_PROP(n, current_speed), \ .baud_rate = DT_INST_PROP(n, current_speed), \
.hw_flow_control = DT_INST_PROP(n, hw_flow_control), \ .hw_flow_control = DT_INST_PROP(n, hw_flow_control), \
PINCTRL_INIT(n) \
IRQ_FUNC_INIT \ IRQ_FUNC_INIT \
} }
@ -324,6 +349,8 @@ static const struct uart_driver_api rv32m1_lpuart_driver_api = {
#endif #endif
#define RV32M1_LPUART_INIT(n) \ #define RV32M1_LPUART_INIT(n) \
PINCTRL_DEFINE(n) \
\
static struct rv32m1_lpuart_data rv32m1_lpuart_##n##_data; \ static struct rv32m1_lpuart_data rv32m1_lpuart_##n##_data; \
\ \
static const struct rv32m1_lpuart_config rv32m1_lpuart_##n##_cfg;\ static const struct rv32m1_lpuart_config rv32m1_lpuart_##n##_cfg;\

2
dts/bindings/serial/openisa,rv32m1-lpuart.yaml
View file

@ -2,7 +2,7 @@ description: OpenISA LPUART
compatible: "openisa,rv32m1-lpuart" compatible: "openisa,rv32m1-lpuart"
include: uart-controller.yaml include: [uart-controller.yaml, pinctrl-device.yaml]
properties: properties:
reg: reg: