Merge tag 'sound-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[karo-tx-linux.git] / drivers / tty / serial / sh-sci.h

diff --git a/drivers/tty/serial/sh-sci.h b/drivers/tty/serial/sh-sci.h
index ffa6d688c335f252c453e821f246b4bbe357ea88..971b2ab088d847af9d3d2b4e4c0c2dd820eee653 100644 (file)
--- a/drivers/tty/serial/sh-sci.h
+++ b/drivers/tty/serial/sh-sci.h
@@ -29,6 +29,8 @@ enum {
        SCPDR,                          /* Serial Port Data Register */
        SCDL,                           /* BRG Frequency Division Register */
        SCCKS,                          /* BRG Clock Select Register */
+       HSRTRGR,                        /* Rx FIFO Data Count Trigger Register */
+       HSTTRGR,                        /* Tx FIFO Data Count Trigger Register */
 
        SCIx_NR_REGS,
 };
@@ -99,6 +101,10 @@ enum {
 #define SCIF_BREAK_CLEAR       (u32)(~(SCIF_PER | SCIF_FER | SCIF_BRK))
 
 /* SCFCR (FIFO Control Register) */
+#define SCFCR_RTRG1    BIT(7)  /* Receive FIFO Data Count Trigger */
+#define SCFCR_RTRG0    BIT(6)
+#define SCFCR_TTRG1    BIT(5)  /* Transmit FIFO Data Count Trigger */
+#define SCFCR_TTRG0    BIT(4)
 #define SCFCR_MCE      BIT(3)  /* Modem Control Enable */
 #define SCFCR_TFRST    BIT(2)  /* Transmit FIFO Data Register Reset */
 #define SCFCR_RFRST    BIT(1)  /* Receive FIFO Data Register Reset */
@@ -145,18 +151,18 @@ enum {
 #define SCCKS_XIN      BIT(14) /* SC_CLK uses bus clock (1) or SCIF_CLK (0) */
 
 #define SCxSR_TEND(port)       (((port)->type == PORT_SCI) ? SCI_TEND   : SCIF_TEND)
-#define SCxSR_RDxF(port)       (((port)->type == PORT_SCI) ? SCI_RDRF   : SCIF_RDF)
+#define SCxSR_RDxF(port)       (((port)->type == PORT_SCI) ? SCI_RDRF   : SCIF_DR | SCIF_RDF)
 #define SCxSR_TDxE(port)       (((port)->type == PORT_SCI) ? SCI_TDRE   : SCIF_TDFE)
 #define SCxSR_FER(port)                (((port)->type == PORT_SCI) ? SCI_FER    : SCIF_FER)
 #define SCxSR_PER(port)                (((port)->type == PORT_SCI) ? SCI_PER    : SCIF_PER)
 #define SCxSR_BRK(port)                (((port)->type == PORT_SCI) ? 0x00       : SCIF_BRK)
 
-#define SCxSR_ERRORS(port)     (to_sci_port(port)->error_mask)
+#define SCxSR_ERRORS(port)     (to_sci_port(port)->params->error_mask)
 
 #define SCxSR_RDxF_CLEAR(port) \
        (((port)->type == PORT_SCI) ? SCI_RDxF_CLEAR : SCIF_RDxF_CLEAR)
 #define SCxSR_ERROR_CLEAR(port) \
-       (to_sci_port(port)->error_clear)
+       (to_sci_port(port)->params->error_clear)
 #define SCxSR_TDxE_CLEAR(port) \
        (((port)->type == PORT_SCI) ? SCI_TDxE_CLEAR : SCIF_TDxE_CLEAR)
 #define SCxSR_BREAK_CLEAR(port) \