Commit 3c0eb442 authored by Linus Torvalds's avatar Linus Torvalds

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
parents c6cf6be9 a82c3df9
...@@ -310,7 +310,7 @@ static const struct lpuart_soc_data ls1021a_data = { ...@@ -310,7 +310,7 @@ static const struct lpuart_soc_data ls1021a_data = {
static const struct lpuart_soc_data ls1028a_data = { static const struct lpuart_soc_data ls1028a_data = {
.devtype = LS1028A_LPUART, .devtype = LS1028A_LPUART,
.iotype = UPIO_MEM32, .iotype = UPIO_MEM32,
.rx_watermark = 1, .rx_watermark = 0,
}; };
static struct lpuart_soc_data imx7ulp_data = { static struct lpuart_soc_data imx7ulp_data = {
......
...@@ -250,6 +250,7 @@ lqasc_err_int(int irq, void *_port) ...@@ -250,6 +250,7 @@ lqasc_err_int(int irq, void *_port)
struct ltq_uart_port *ltq_port = to_ltq_uart_port(port); struct ltq_uart_port *ltq_port = to_ltq_uart_port(port);
spin_lock_irqsave(&ltq_port->lock, flags); spin_lock_irqsave(&ltq_port->lock, flags);
__raw_writel(ASC_IRNCR_EIR, port->membase + LTQ_ASC_IRNCR);
/* clear any pending interrupts */ /* clear any pending interrupts */
asc_update_bits(0, ASCWHBSTATE_CLRPE | ASCWHBSTATE_CLRFE | asc_update_bits(0, ASCWHBSTATE_CLRPE | ASCWHBSTATE_CLRFE |
ASCWHBSTATE_CLRROE, port->membase + LTQ_ASC_WHBSTATE); ASCWHBSTATE_CLRROE, port->membase + LTQ_ASC_WHBSTATE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment