diff options
Diffstat (limited to 'drivers/serial/sh-sci.h')
-rw-r--r-- | drivers/serial/sh-sci.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h index 6da755d63529..4479a91e2479 100644 --- a/drivers/serial/sh-sci.h +++ b/drivers/serial/sh-sci.h | |||
@@ -232,6 +232,10 @@ | |||
232 | # define SCIF_TXROOM_MAX 16 | 232 | # define SCIF_TXROOM_MAX 16 |
233 | #endif | 233 | #endif |
234 | 234 | ||
235 | #ifndef SCIF_ORER | ||
236 | #define SCIF_ORER 0x0000 | ||
237 | #endif | ||
238 | |||
235 | #define SCxSR_TEND(port) (((port)->type == PORT_SCI) ? SCI_TEND : SCIF_TEND) | 239 | #define SCxSR_TEND(port) (((port)->type == PORT_SCI) ? SCI_TEND : SCIF_TEND) |
236 | #define SCxSR_ERRORS(port) (((port)->type == PORT_SCI) ? SCI_ERRORS : SCIF_ERRORS) | 240 | #define SCxSR_ERRORS(port) (((port)->type == PORT_SCI) ? SCI_ERRORS : SCIF_ERRORS) |
237 | #define SCxSR_RDxF(port) (((port)->type == PORT_SCI) ? SCI_RDRF : SCIF_RDF) | 241 | #define SCxSR_RDxF(port) (((port)->type == PORT_SCI) ? SCI_RDRF : SCIF_RDF) |
@@ -239,12 +243,7 @@ | |||
239 | #define SCxSR_FER(port) (((port)->type == PORT_SCI) ? SCI_FER : SCIF_FER) | 243 | #define SCxSR_FER(port) (((port)->type == PORT_SCI) ? SCI_FER : SCIF_FER) |
240 | #define SCxSR_PER(port) (((port)->type == PORT_SCI) ? SCI_PER : SCIF_PER) | 244 | #define SCxSR_PER(port) (((port)->type == PORT_SCI) ? SCI_PER : SCIF_PER) |
241 | #define SCxSR_BRK(port) (((port)->type == PORT_SCI) ? 0x00 : SCIF_BRK) | 245 | #define SCxSR_BRK(port) (((port)->type == PORT_SCI) ? 0x00 : SCIF_BRK) |
242 | 246 | #define SCxSR_ORER(port) (((port)->type == PORT_SCI) ? SCI_ORER : SCIF_ORER) | |
243 | #if defined(CONFIG_CPU_SUBTYPE_SH7705) | ||
244 | # define SCxSR_ORER(port) (((port)->type == PORT_SCI) ? SCI_ORER : SCIF_ORER) | ||
245 | #else | ||
246 | # define SCxSR_ORER(port) (((port)->type == PORT_SCI) ? SCI_ORER : 0x0000) | ||
247 | #endif | ||
248 | 247 | ||
249 | #if defined(CONFIG_CPU_SUBTYPE_SH7705) || \ | 248 | #if defined(CONFIG_CPU_SUBTYPE_SH7705) || \ |
250 | defined(CONFIG_CPU_SUBTYPE_SH7720) || \ | 249 | defined(CONFIG_CPU_SUBTYPE_SH7720) || \ |