diff options
| -rwxr-xr-x | arch/riscv/boot/dts/starfive/jh7110.dtsi | 2 | ||||
| -rw-r--r-- | drivers/tty/serial/8250/8250_core.c | 2 | ||||
| -rw-r--r-- | drivers/tty/serial/8250/8250_dw.c | 3 | ||||
| -rw-r--r-- | drivers/tty/serial/8250/8250_port.c | 14 | ||||
| -rw-r--r-- | include/linux/serial_8250.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/serial_core.h | 2 |
6 files changed, 22 insertions, 2 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi index 0057dfe647e5..4baa10480b95 100755 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -1177,7 +1177,7 @@ reset-names = "rst_apb", "rst_core", "rst_timer"; frequency = <40000000>; starfive,sys-syscon = <&sys_syscon 0x88 0x12 0x40000>; - syscon,can_or_canfd = <1>; + syscon,can_or_canfd = <0>; status = "disabled"; }; diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c index 1ce193daea7f..0629910f5ec1 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -1073,6 +1073,8 @@ int serial8250_register_8250_port(const struct uart_8250_port *up) uart->dl_read = up->dl_read; if (up->dl_write) uart->dl_write = up->dl_write; + if (up->probe) + uart->probe = up->probe; if (uart->port.type != PORT_8250_CIR) { if (serial8250_isa_config != NULL) diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index 4dfb12fb0640..25e434e68ee1 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -522,6 +522,9 @@ static int dw8250_probe(struct platform_device *pdev) /* Always ask for fixed clock rate from a property. */ device_property_read_u32(dev, "clock-frequency", &p->uartclk); + if (device_property_read_bool(dev, "auto-flow-control")) + up->probe |= UART_PROBE_AFE; + /* If there is separate baudclk, get the rate from it. */ data->clk = devm_clk_get_optional(dev, "baudclk"); if (data->clk == NULL) diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index 66374704747e..b4a90a98dbb9 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -307,6 +307,14 @@ static const struct serial8250_config uart_config[] = { .rxtrig_bytes = {1, 32, 64, 112}, .flags = UART_CAP_FIFO | UART_CAP_SLEEP, }, + [PORT_16550A_AFE] = { + .name = "16550A_AFE", + .fifo_size = 16, + .tx_loadsz = 16, + .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, + .rxtrig_bytes = {1, 4, 8, 14}, + .flags = UART_CAP_FIFO | UART_CAP_AFE, + }, }; /* Uart divisor latch read */ @@ -1191,6 +1199,11 @@ static void autoconfig_16550a(struct uart_8250_port *up) up->port.type = PORT_U6_16550A; up->capabilities |= UART_CAP_AFE; } + + if ((up->port.type == PORT_16550A) && (up->probe & UART_PROBE_AFE)) { + up->port.type = PORT_16550A_AFE; + up->capabilities |= UART_CAP_AFE; + } } /* @@ -2778,7 +2791,6 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, if (termios->c_cflag & CRTSCTS) up->mcr |= UART_MCR_AFE; } - /* * Update the per-port timeout. */ diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h index 5db211f43b29..068ba67788bc 100644 --- a/include/linux/serial_8250.h +++ b/include/linux/serial_8250.h @@ -114,6 +114,7 @@ struct uart_8250_port { unsigned char probe; struct mctrl_gpios *gpios; #define UART_PROBE_RSA (1 << 0) +#define UART_PROBE_AFE (1 << 1) /* * Some bits in registers are cleared on a read, so they must diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h index c4042dcfdc0c..b1cc643d058f 100644 --- a/include/uapi/linux/serial_core.h +++ b/include/uapi/linux/serial_core.h @@ -274,4 +274,6 @@ /* Freescale LINFlexD UART */ #define PORT_LINFLEXUART 122 +#define PORT_16550A_AFE 124 + #endif /* _UAPILINUX_SERIAL_CORE_H */ |