Merge tag 'x86_seves_for_v5.10_rc3' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / tty / serial / fsl_lpuart.c

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index ff4b88c..bd047e1 100644 (file)
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -314,9 +314,10 @@ MODULE_DEVICE_TABLE(of, lpuart_dt_ids);
 /* Forward declare this for the dma callbacks*/
 static void lpuart_dma_tx_complete(void *arg);
 
-static inline bool is_ls1028a_lpuart(struct lpuart_port *sport)
+static inline bool is_layerscape_lpuart(struct lpuart_port *sport)
 {
-       return sport->devtype == LS1028A_LPUART;
+       return (sport->devtype == LS1021A_LPUART ||
+               sport->devtype == LS1028A_LPUART);
 }
 
 static inline bool is_imx8qxp_lpuart(struct lpuart_port *sport)
@@ -1701,11 +1702,11 @@ static int lpuart32_startup(struct uart_port *port)
                                            UARTFIFO_FIFOSIZE_MASK);
 
        /*
-        * The LS1028A has a fixed length of 16 words. Although it supports the
-        * RX/TXSIZE fields their encoding is different. Eg the reference manual
-        * states 0b101 is 16 words.
+        * The LS1021A and LS1028A have a fixed FIFO depth of 16 words.
+        * Although they support the RX/TXSIZE fields, their encoding is
+        * different. Eg the reference manual states 0b101 is 16 words.
         */
-       if (is_ls1028a_lpuart(sport)) {
+       if (is_layerscape_lpuart(sport)) {
                sport->rxfifo_size = 16;
                sport->txfifo_size = 16;
                sport->port.fifosize = sport->txfifo_size;