Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 8542
b: refs/heads/master
c: b0433b9
h: refs/heads/master
v: v3
  • Loading branch information
Greg Ungerer authored and Linus Torvalds committed Sep 12, 2005
1 parent 4a8c8df commit 6ed255e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9c1ee9387c0ce06d573e2d27de10cbc24179941e
refs/heads/master: b0433b99339a9fdc2effe213491812556e4896fb
13 changes: 9 additions & 4 deletions trunk/drivers/serial/mcfserial.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,13 @@ struct timer_list mcfrs_timer_struct;
#endif

#if defined(CONFIG_HW_FEITH)
#define CONSOLE_BAUD_RATE 38400
#define DEFAULT_CBAUD B38400
#define CONSOLE_BAUD_RATE 38400
#define DEFAULT_CBAUD B38400
#endif

#if defined(CONFIG_MOD5272)
#define CONSOLE_BAUD_RATE 115200
#define DEFAULT_CBAUD B115200
#endif

#ifndef CONSOLE_BAUD_RATE
Expand All @@ -90,7 +95,7 @@ static struct tty_driver *mcfrs_serial_driver;
#undef SERIAL_DEBUG_OPEN
#undef SERIAL_DEBUG_FLOW

#if defined(CONFIG_M527x) || defined(CONFIG_M528x)
#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)
#define IRQBASE (MCFINT_VECBASE+MCFINT_UART0)
#else
#define IRQBASE 73
Expand Down Expand Up @@ -1510,7 +1515,7 @@ static void mcfrs_irqinit(struct mcf_serial *info)
*portp = (*portp & ~0x000000ff) | 0x00000055;
portp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_PDCNT);
*portp = (*portp & ~0x000003fc) | 0x000002a8;
#elif defined(CONFIG_M527x) || defined(CONFIG_M528x)
#elif defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)
volatile unsigned char *icrp, *uartp;
volatile unsigned long *imrp;

Expand Down

0 comments on commit 6ed255e

Please sign in to comment.