Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions drivers/serial/uart_lpc11u6x.c
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,11 @@ static void lpc11u6x_uart0_isr_config(const struct device *dev);

PINCTRL_DT_DEFINE(DT_NODELABEL(uart0));

BUILD_ASSERT(DT_PROP(DT_NODELABEL(uart0), rx_invert) == 0,
"rx-invert not supported for UART0");
BUILD_ASSERT(DT_PROP(DT_NODELABEL(uart0), tx_invert) == 0,
"tx-invert not supported for UART0");

static const struct lpc11u6x_uart0_config uart0_config = {
.uart0 = (struct lpc11u6x_uart0_regs *)
DT_REG_ADDR(DT_NODELABEL(uart0)),
Expand Down Expand Up @@ -568,6 +573,13 @@ static int lpc11u6x_uartx_configure(const struct device *dev,
return -ENOTSUP;
}

if (dev_cfg->rx_invert) {
flags |= LPC11U6X_UARTX_CFG_RXPOL(1);
}
if (dev_cfg->tx_invert) {
flags |= LPC11U6X_UARTX_CFG_TXPOL(1);
}

/* Disable UART */
dev_cfg->base->cfg = 0;

Expand Down Expand Up @@ -786,6 +798,13 @@ static int lpc11u6x_uartx_init(const struct device *dev)
data->data_bits = UART_CFG_DATA_BITS_8;
data->flow_ctrl = UART_CFG_FLOW_CTRL_NONE;

if (cfg->rx_invert) {
cfg->base->cfg |= LPC11U6X_UARTX_CFG_RXPOL(1);
}
if (cfg->tx_invert) {
cfg->base->cfg |= LPC11U6X_UARTX_CFG_TXPOL(1);
}

/* Enable UART */
cfg->base->cfg = (cfg->base->cfg & LPC11U6X_UARTX_CFG_MASK) |
LPC11U6X_UARTX_CFG_ENABLE;
Expand Down Expand Up @@ -845,6 +864,8 @@ static const struct lpc11u6x_uartx_config uart_cfg_##idx = { \
.clkid = DT_PHA_BY_IDX(DT_NODELABEL(uart##idx), clocks, 0, clkid), \
.pincfg = PINCTRL_DT_DEV_CONFIG_GET(DT_NODELABEL(uart##idx)), \
.baudrate = DT_PROP(DT_NODELABEL(uart##idx), current_speed), \
.rx_invert = DT_PROP(DT_NODELABEL(uart##idx), rx_invert), \
.tx_invert = DT_PROP(DT_NODELABEL(uart##idx), tx_invert), \
}; \
\
static struct lpc11u6x_uartx_data uart_data_##idx; \
Expand Down
5 changes: 5 additions & 0 deletions drivers/serial/uart_lpc11u6x.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
#define LPC11U6X_UARTX_CFG_STOP_1BIT (0x0 << 6)
#define LPC11U6X_UARTX_CFG_STOP_2BIT (0x1 << 6)

#define LPC11U6X_UARTX_CFG_RXPOL(x) (((x) & 0x1) << 22)
#define LPC11U6X_UARTX_CFG_TXPOL(x) (((x) & 0x1) << 23)

#define LPC11U6X_UARTX_CFG_MASK (0x00FCDAFD)

#define LPC11U6X_UARTX_STAT_RXRDY (1 << 0)
Expand Down Expand Up @@ -170,6 +173,8 @@ struct lpc11u6x_uartx_config {
const struct device *clock_dev;
uint32_t baudrate;
uint32_t clkid;
bool rx_invert;
bool tx_invert;
const struct pinctrl_dev_config *pincfg;
};

Expand Down
2 changes: 1 addition & 1 deletion dts/bindings/serial/nxp,lpc11u6x-uart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ description: LPC11U6X UART

compatible: "nxp,lpc11u6x-uart"

include: [uart-controller.yaml, pinctrl-device.yaml]
include: [uart-controller.yaml, uart-controller-pin-inversion.yaml, pinctrl-device.yaml]

properties:
reg:
Expand Down