kernel: bump 4.19 to 4.19.115

[openwrt/staging/chunkeey.git] / target / linux / ath79 / patches-4.19 / 0061-tty-serial-ar933x-uart-rs485-gpio.patch

diff --git a/target/linux/ath79/patches-4.19/0061-tty-serial-ar933x-uart-rs485-gpio.patch b/target/linux/ath79/patches-4.19/0061-tty-serial-ar933x-uart-rs485-gpio.patch
index 7bbcaa08a6ce59e028df22c708e5839142b05149..b77cd2d574c4e2d86ec11626a0610028948e37b8 100644 (file)
--- a/target/linux/ath79/patches-4.19/0061-tty-serial-ar933x-uart-rs485-gpio.patch
+++ b/target/linux/ath79/patches-4.19/0061-tty-serial-ar933x-uart-rs485-gpio.patch
@@ -160,7 +160,7 @@ v2: use bool to indicate ongoing half-duplex send, use it afterwards
  }
  
  static void ar933x_uart_break_ctl(struct uart_port *port, int break_state)
-@@ -336,11 +393,20 @@ static void ar933x_uart_rx_chars(struct
+@@ -340,11 +397,20 @@ static void ar933x_uart_rx_chars(struct
  static void ar933x_uart_tx_chars(struct ar933x_uart_port *up)
  {
        struct circ_buf *xmit = &up->port.state->xmit;
@@ -181,7 +181,7 @@ v2: use bool to indicate ongoing half-duplex send, use it afterwards
        count = up->port.fifosize;
        do {
                unsigned int rdata;
-@@ -368,8 +434,14 @@ static void ar933x_uart_tx_chars(struct
+@@ -372,8 +438,14 @@ static void ar933x_uart_tx_chars(struct
        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
                uart_write_wakeup(&up->port);
  
@@ -197,7 +197,7 @@ v2: use bool to indicate ongoing half-duplex send, use it afterwards
  }
  
  static irqreturn_t ar933x_uart_interrupt(int irq, void *dev_id)
-@@ -427,8 +499,7 @@ static int ar933x_uart_startup(struct ua
+@@ -435,8 +507,7 @@ static int ar933x_uart_startup(struct ua
                AR933X_UART_CS_TX_READY_ORIDE | AR933X_UART_CS_RX_READY_ORIDE);
  
        /* Enable RX interrupts */
@@ -207,7 +207,7 @@ v2: use bool to indicate ongoing half-duplex send, use it afterwards
  
        spin_unlock_irqrestore(&up->port.lock, flags);
  
-@@ -511,6 +582,21 @@ static const struct uart_ops ar933x_uart
+@@ -519,6 +590,21 @@ static const struct uart_ops ar933x_uart
        .verify_port    = ar933x_uart_verify_port,
  };
  
@@ -229,7 +229,7 @@ v2: use bool to indicate ongoing half-duplex send, use it afterwards
  #ifdef CONFIG_SERIAL_AR933X_CONSOLE
  static struct ar933x_uart_port *
  ar933x_console_ports[CONFIG_SERIAL_AR933X_NR_UARTS];
-@@ -680,6 +766,8 @@ static int ar933x_uart_probe(struct plat
+@@ -688,6 +774,8 @@ static int ar933x_uart_probe(struct plat
                goto err_disable_clk;
        }
  
@@ -238,7 +238,7 @@ v2: use bool to indicate ongoing half-duplex send, use it afterwards
        port->mapbase = mem_res->start;
        port->line = id;
        port->irq = irq_res->start;
-@@ -690,6 +778,7 @@ static int ar933x_uart_probe(struct plat
+@@ -698,6 +786,7 @@ static int ar933x_uart_probe(struct plat
        port->regshift = 2;
        port->fifosize = AR933X_UART_FIFO_SIZE;
        port->ops = &ar933x_uart_ops;
@@ -246,7 +246,7 @@ v2: use bool to indicate ongoing half-duplex send, use it afterwards
  
        baud = ar933x_uart_get_baud(port->uartclk, AR933X_UART_MAX_SCALE, 1);
        up->min_baud = max_t(unsigned int, baud, AR933X_UART_MIN_BAUD);
-@@ -697,6 +786,18 @@ static int ar933x_uart_probe(struct plat
+@@ -705,6 +794,18 @@ static int ar933x_uart_probe(struct plat
        baud = ar933x_uart_get_baud(port->uartclk, 0, AR933X_UART_MAX_STEP);
        up->max_baud = min_t(unsigned int, baud, AR933X_UART_MAX_BAUD);