Skip to content

Commit 3c0eb44

Browse files
committed
Merge tag 'tty-6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull serial driver fixes from Greg KH: "Here are two small serial driver fixes for 6.4-rc7 that resolve some reported problems: - lantiq serial driver irq fix - fsl_lpuart serial driver watermark fix Both of these have been in linux-next this week with no reported issues" * tag 'tty-6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: tty: serial: fsl_lpuart: reduce RX watermark to 0 on LS1028A serial: lantiq: add missing interrupt ack
2 parents c6cf6be + a82c3df commit 3c0eb44

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

drivers/tty/serial/fsl_lpuart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ static const struct lpuart_soc_data ls1021a_data = {
310310
static const struct lpuart_soc_data ls1028a_data = {
311311
.devtype = LS1028A_LPUART,
312312
.iotype = UPIO_MEM32,
313-
.rx_watermark = 1,
313+
.rx_watermark = 0,
314314
};
315315

316316
static struct lpuart_soc_data imx7ulp_data = {

drivers/tty/serial/lantiq.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ lqasc_err_int(int irq, void *_port)
250250
struct ltq_uart_port *ltq_port = to_ltq_uart_port(port);
251251

252252
spin_lock_irqsave(&ltq_port->lock, flags);
253+
__raw_writel(ASC_IRNCR_EIR, port->membase + LTQ_ASC_IRNCR);
253254
/* clear any pending interrupts */
254255
asc_update_bits(0, ASCWHBSTATE_CLRPE | ASCWHBSTATE_CLRFE |
255256
ASCWHBSTATE_CLRROE, port->membase + LTQ_ASC_WHBSTATE);

0 commit comments

Comments
 (0)