diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-05-15 03:25:47 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@hera.kernel.org> | 2007-06-07 22:43:40 -0400 |
| commit | 05627486ab7f31ea09d8bb7a83582ca0185dc283 (patch) | |
| tree | 79189f3118568cff90b374d433de0ea2c8b2fe1f /drivers/serial | |
| parent | fd8f20e8e2f8f1d9201086bff444c8d35f0a6a45 (diff) | |
sh: Fix SH-4 CPU selects.
Now that select no longer works for selecting the "closest" CPU,
we have to explicitly reference the precise sub-type in the few
places where it actually matters (presently only setup code and
some legacy sh-sci cruft).
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/sh-sci.h | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h index fb04fb5f9843..da643b31715b 100644 --- a/drivers/serial/sh-sci.h +++ b/drivers/serial/sh-sci.h | |||
| @@ -53,7 +53,12 @@ | |||
| 53 | # define SCIF_ORER 0x0001 /* overrun error bit */ | 53 | # define SCIF_ORER 0x0001 /* overrun error bit */ |
| 54 | # define SCSCR_INIT(port) 0x3a /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ | 54 | # define SCSCR_INIT(port) 0x3a /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ |
| 55 | # define SCIF_ONLY | 55 | # define SCIF_ONLY |
| 56 | #elif defined(CONFIG_CPU_SUBTYPE_SH7750) || defined(CONFIG_CPU_SUBTYPE_SH7751) | 56 | #elif defined(CONFIG_CPU_SUBTYPE_SH7750) || \ |
| 57 | defined(CONFIG_CPU_SUBTYPE_SH7750R) || \ | ||
| 58 | defined(CONFIG_CPU_SUBTYPE_SH7750S) || \ | ||
| 59 | defined(CONFIG_CPU_SUBTYPE_SH7091) || \ | ||
| 60 | defined(CONFIG_CPU_SUBTYPE_SH7751) || \ | ||
| 61 | defined(CONFIG_CPU_SUBTYPE_SH7751R) | ||
| 57 | # define SCSPTR1 0xffe0001c /* 8 bit SCI */ | 62 | # define SCSPTR1 0xffe0001c /* 8 bit SCI */ |
| 58 | # define SCSPTR2 0xFFE80020 /* 16 bit SCIF */ | 63 | # define SCSPTR2 0xFFE80020 /* 16 bit SCIF */ |
| 59 | # define SCIF_ORER 0x0001 /* overrun error bit */ | 64 | # define SCIF_ORER 0x0001 /* overrun error bit */ |
| @@ -177,9 +182,13 @@ | |||
| 177 | #define SCI_CTRL_FLAGS_RIE 0x40 /* all */ | 182 | #define SCI_CTRL_FLAGS_RIE 0x40 /* all */ |
| 178 | #define SCI_CTRL_FLAGS_TE 0x20 /* all */ | 183 | #define SCI_CTRL_FLAGS_TE 0x20 /* all */ |
| 179 | #define SCI_CTRL_FLAGS_RE 0x10 /* all */ | 184 | #define SCI_CTRL_FLAGS_RE 0x10 /* all */ |
| 180 | #if defined(CONFIG_CPU_SUBTYPE_SH7750) || \ | 185 | #if defined(CONFIG_CPU_SUBTYPE_SH7750) || \ |
| 181 | defined(CONFIG_CPU_SUBTYPE_SH7751) || \ | 186 | defined(CONFIG_CPU_SUBTYPE_SH7091) || \ |
| 182 | defined(CONFIG_CPU_SUBTYPE_SH7780) || \ | 187 | defined(CONFIG_CPU_SUBTYPE_SH7750R) || \ |
| 188 | defined(CONFIG_CPU_SUBTYPE_SH7750S) || \ | ||
| 189 | defined(CONFIG_CPU_SUBTYPE_SH7751) || \ | ||
| 190 | defined(CONFIG_CPU_SUBTYPE_SH7751R) || \ | ||
| 191 | defined(CONFIG_CPU_SUBTYPE_SH7780) || \ | ||
| 183 | defined(CONFIG_CPU_SUBTYPE_SH7785) | 192 | defined(CONFIG_CPU_SUBTYPE_SH7785) |
| 184 | #define SCI_CTRL_FLAGS_REIE 0x08 /* 7750 SCIF */ | 193 | #define SCI_CTRL_FLAGS_REIE 0x08 /* 7750 SCIF */ |
| 185 | #else | 194 | #else |
| @@ -514,8 +523,12 @@ static inline void set_sh771x_scif_pfc(struct uart_port *port) | |||
| 514 | } | 523 | } |
| 515 | } | 524 | } |
| 516 | 525 | ||
| 517 | #elif defined(CONFIG_CPU_SUBTYPE_SH7750) || \ | 526 | #elif defined(CONFIG_CPU_SUBTYPE_SH7750) || \ |
| 518 | defined(CONFIG_CPU_SUBTYPE_SH7751) || \ | 527 | defined(CONFIG_CPU_SUBTYPE_SH7751) || \ |
| 528 | defined(CONFIG_CPU_SUBTYPE_SH7751R) || \ | ||
| 529 | defined(CONFIG_CPU_SUBTYPE_SH7750R) || \ | ||
| 530 | defined(CONFIG_CPU_SUBTYPE_SH7750S) || \ | ||
| 531 | defined(CONFIG_CPU_SUBTYPE_SH7091) || \ | ||
| 519 | defined(CONFIG_CPU_SUBTYPE_SH4_202) | 532 | defined(CONFIG_CPU_SUBTYPE_SH4_202) |
| 520 | static inline int sci_rxd_in(struct uart_port *port) | 533 | static inline int sci_rxd_in(struct uart_port *port) |
| 521 | { | 534 | { |