diff options
Diffstat (limited to 'drivers/tty/serial/sh-sci.h')
-rw-r--r-- | drivers/tty/serial/sh-sci.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/tty/serial/sh-sci.h b/drivers/tty/serial/sh-sci.h index 5fefed53fa42..b04d937c9110 100644 --- a/drivers/tty/serial/sh-sci.h +++ b/drivers/tty/serial/sh-sci.h | |||
@@ -270,12 +270,12 @@ | |||
270 | #elif defined(CONFIG_CPU_SUBTYPE_SH7705) || \ | 270 | #elif defined(CONFIG_CPU_SUBTYPE_SH7705) || \ |
271 | defined(CONFIG_CPU_SUBTYPE_SH7720) || \ | 271 | defined(CONFIG_CPU_SUBTYPE_SH7720) || \ |
272 | defined(CONFIG_CPU_SUBTYPE_SH7721) || \ | 272 | defined(CONFIG_CPU_SUBTYPE_SH7721) || \ |
273 | defined(CONFIG_ARCH_SH73A0) || \ | 273 | defined(CONFIG_ARCH_SH7367) |
274 | defined(CONFIG_ARCH_SH7367) || \ | ||
275 | defined(CONFIG_ARCH_SH7377) | ||
276 | #define SCIF_FNS(name, scif_offset, scif_size) \ | 274 | #define SCIF_FNS(name, scif_offset, scif_size) \ |
277 | CPU_SCIF_FNS(name, scif_offset, scif_size) | 275 | CPU_SCIF_FNS(name, scif_offset, scif_size) |
278 | #elif defined(CONFIG_ARCH_SH7372) | 276 | #elif defined(CONFIG_ARCH_SH7377) || \ |
277 | defined(CONFIG_ARCH_SH7372) || \ | ||
278 | defined(CONFIG_ARCH_SH73A0) | ||
279 | #define SCIx_FNS(name, sh4_scifa_offset, sh4_scifa_size, sh4_scifb_offset, sh4_scifb_size) \ | 279 | #define SCIx_FNS(name, sh4_scifa_offset, sh4_scifa_size, sh4_scifb_offset, sh4_scifb_size) \ |
280 | CPU_SCIx_FNS(name, sh4_scifa_offset, sh4_scifa_size, sh4_scifb_offset, sh4_scifb_size) | 280 | CPU_SCIx_FNS(name, sh4_scifa_offset, sh4_scifa_size, sh4_scifb_offset, sh4_scifb_size) |
281 | #define SCIF_FNS(name, scif_offset, scif_size) \ | 281 | #define SCIF_FNS(name, scif_offset, scif_size) \ |
@@ -313,9 +313,7 @@ | |||
313 | #if defined(CONFIG_CPU_SUBTYPE_SH7705) || \ | 313 | #if defined(CONFIG_CPU_SUBTYPE_SH7705) || \ |
314 | defined(CONFIG_CPU_SUBTYPE_SH7720) || \ | 314 | defined(CONFIG_CPU_SUBTYPE_SH7720) || \ |
315 | defined(CONFIG_CPU_SUBTYPE_SH7721) || \ | 315 | defined(CONFIG_CPU_SUBTYPE_SH7721) || \ |
316 | defined(CONFIG_ARCH_SH73A0) || \ | 316 | defined(CONFIG_ARCH_SH7367) |
317 | defined(CONFIG_ARCH_SH7367) || \ | ||
318 | defined(CONFIG_ARCH_SH7377) | ||
319 | 317 | ||
320 | SCIF_FNS(SCSMR, 0x00, 16) | 318 | SCIF_FNS(SCSMR, 0x00, 16) |
321 | SCIF_FNS(SCBRR, 0x04, 8) | 319 | SCIF_FNS(SCBRR, 0x04, 8) |
@@ -326,7 +324,9 @@ SCIF_FNS(SCFDR, 0x1c, 16) | |||
326 | SCIF_FNS(SCxTDR, 0x20, 8) | 324 | SCIF_FNS(SCxTDR, 0x20, 8) |
327 | SCIF_FNS(SCxRDR, 0x24, 8) | 325 | SCIF_FNS(SCxRDR, 0x24, 8) |
328 | SCIF_FNS(SCLSR, 0x00, 0) | 326 | SCIF_FNS(SCLSR, 0x00, 0) |
329 | #elif defined(CONFIG_ARCH_SH7372) | 327 | #elif defined(CONFIG_ARCH_SH7377) || \ |
328 | defined(CONFIG_ARCH_SH7372) || \ | ||
329 | defined(CONFIG_ARCH_SH73A0) | ||
330 | SCIF_FNS(SCSMR, 0x00, 16) | 330 | SCIF_FNS(SCSMR, 0x00, 16) |
331 | SCIF_FNS(SCBRR, 0x04, 8) | 331 | SCIF_FNS(SCBRR, 0x04, 8) |
332 | SCIF_FNS(SCSCR, 0x08, 16) | 332 | SCIF_FNS(SCSCR, 0x08, 16) |