kernel: bump 4.19 to 4.19.115

[openwrt/staging/rmilecki.git] / target / linux / ath79 / patches-4.19 / 0060-serial-ar933x_uart-set-UART_CS_-RX-TX-_READY_ORIDE.patch

diff --git a/target/linux/ath79/patches-4.19/0060-serial-ar933x_uart-set-UART_CS_-RX-TX-_READY_ORIDE.patch b/target/linux/ath79/patches-4.19/0060-serial-ar933x_uart-set-UART_CS_-RX-TX-_READY_ORIDE.patch
index 2ed520683e6ee742aa19cb5fa53d8bdc8c95b90e..30828d693c9269475dccabae23cda91cececffda 100644 (file)
--- a/target/linux/ath79/patches-4.19/0060-serial-ar933x_uart-set-UART_CS_-RX-TX-_READY_ORIDE.patch
+++ b/target/linux/ath79/patches-4.19/0060-serial-ar933x_uart-set-UART_CS_-RX-TX-_READY_ORIDE.patch
@@ -40,9 +40,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/tty/serial/ar933x_uart.c
 +++ b/drivers/tty/serial/ar933x_uart.c
-@@ -328,6 +328,10 @@ static void ar933x_uart_set_termios(stru
+@@ -290,6 +290,10 @@ static void ar933x_uart_set_termios(stru
        ar933x_uart_rmw_set(up, AR933X_UART_CS_REG,
-                           AR933X_UART_CS_HOST_INT_EN);
+               AR933X_UART_CS_TX_READY_ORIDE | AR933X_UART_CS_RX_READY_ORIDE);
  
 +      /* enable RX and TX ready overide */
 +      ar933x_uart_rmw_set(up, AR933X_UART_CS_REG,
@@ -51,14 +51,14 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        /* reenable the UART */
        ar933x_uart_rmw(up, AR933X_UART_CS_REG,
                        AR933X_UART_CS_IF_MODE_M << AR933X_UART_CS_IF_MODE_S,
-@@ -460,6 +464,10 @@ static int ar933x_uart_startup(struct ua
-       ar933x_uart_rmw_set(up, AR933X_UART_CS_REG,
-                           AR933X_UART_CS_HOST_INT_EN);
+@@ -424,6 +428,10 @@ static int ar933x_uart_startup(struct ua
  
-+      /* enable RX and TX ready overide */
-+      ar933x_uart_rmw_set(up, AR933X_UART_CS_REG,
+       /* enable RX and TX ready overide */
+       ar933x_uart_rmw_set(up, AR933X_UART_CS_REG,
 +              AR933X_UART_CS_TX_READY_ORIDE | AR933X_UART_CS_RX_READY_ORIDE);
 +
++      /* enable RX and TX ready overide */
++      ar933x_uart_rmw_set(up, AR933X_UART_CS_REG,
+               AR933X_UART_CS_TX_READY_ORIDE | AR933X_UART_CS_RX_READY_ORIDE);
+ 
        /* Enable RX interrupts */
-       up->ier = AR933X_UART_INT_RX_VALID;
-       ar933x_uart_write(up, AR933X_UART_INT_EN_REG, up->ier);