Merge tag 'v4.3-rc2' into topic/drm-misc

[karo-tx-linux.git] / arch / mn10300 / kernel / mn10300-serial.h

diff --git a/arch/mn10300/kernel/mn10300-serial.h b/arch/mn10300/kernel/mn10300-serial.h
index 6796499bf789b0136a79a066afaa44a0b901f072..01791c68ea1f1330894e71f41f1ded0131d82e93 100644 (file)
--- a/arch/mn10300/kernel/mn10300-serial.h
+++ b/arch/mn10300/kernel/mn10300-serial.h
@@ -29,6 +29,10 @@
 #define MNSCx_TX_SPACE         0x04
 #define MNSCx_TX_EMPTY         0x08
 
+/* tx_flags bits */
+#define MNSCx_TX_BREAK         0x01
+#define MNSCx_TX_STOP          0x02
+
 #ifndef __ASSEMBLY__
 
 struct mn10300_serial_port {
@@ -36,7 +40,7 @@ struct mn10300_serial_port {
        unsigned                rx_inp;         /* pointer to rx input offset */
        unsigned                rx_outp;        /* pointer to rx output offset */
        u8                      tx_xchar;       /* high-priority XON/XOFF buffer */
-       u8                      tx_break;       /* transmit break request */
+       u8                      tx_flags;       /* transmit break/stop request */
        u8                      intr_flags;     /* interrupt flags */
        volatile u16            *rx_icr;        /* Rx interrupt control register */
        volatile u16            *tx_icr;        /* Tx interrupt control register */
@@ -54,8 +58,8 @@ struct mn10300_serial_port {
        volatile u16            *_control;      /* control register pointer */
        volatile u8             *_status;       /* status register pointer */
        volatile u8             *_intr;         /* interrupt register pointer */
-       volatile void           *_rxb;          /* receive buffer register pointer */
-       volatile void           *_txb;          /* transmit buffer register pointer */
+       volatile u8             *_rxb;          /* receive buffer register pointer */
+       volatile u8             *_txb;          /* transmit buffer register pointer */
        volatile u16            *_tmicr;        /* timer interrupt control register */
        volatile u8             *_tmxmd;        /* baud rate timer mode register */
        volatile u16            *_tmxbr;        /* baud rate timer base register */