Merge tag 'rtc-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

[karo-tx-linux.git] / drivers / tty / serial / mxs-auart.c

diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 8c1c9112b3fdd0cff5f5bee9a3912bef2c46a2f6..6989b227d1349baeb0cb05ed9f7cff8572e36324 100644 (file)
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -95,6 +95,7 @@
 #define AUART_LINECTRL_BAUD_DIVFRAC_SHIFT      8
 #define AUART_LINECTRL_BAUD_DIVFRAC_MASK       0x00003f00
 #define AUART_LINECTRL_BAUD_DIVFRAC(v)         (((v) & 0x3f) << 8)
+#define AUART_LINECTRL_SPS                     (1 << 7)
 #define AUART_LINECTRL_WLEN_MASK               0x00000060
 #define AUART_LINECTRL_WLEN(v)                 (((v) & 0x3) << 5)
 #define AUART_LINECTRL_FEN                     (1 << 4)
@@ -1014,6 +1015,8 @@ static void mxs_auart_settermios(struct uart_port *u,
                ctrl |= AUART_LINECTRL_PEN;
                if ((cflag & PARODD) == 0)
                        ctrl |= AUART_LINECTRL_EPS;
+               if (cflag & CMSPAR)
+                       ctrl |= AUART_LINECTRL_SPS;
        }
 
        u->read_status_mask = AUART_STAT_OERR;