aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/serial/mcfserial.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
index 43b03c55f453..e2ebdcad553c 100644
--- a/drivers/serial/mcfserial.c
+++ b/drivers/serial/mcfserial.c
@@ -63,8 +63,13 @@ struct timer_list mcfrs_timer_struct;
63#endif 63#endif
64 64
65#if defined(CONFIG_HW_FEITH) 65#if defined(CONFIG_HW_FEITH)
66 #define CONSOLE_BAUD_RATE 38400 66#define CONSOLE_BAUD_RATE 38400
67 #define DEFAULT_CBAUD B38400 67#define DEFAULT_CBAUD B38400
68#endif
69
70#if defined(CONFIG_MOD5272)
71#define CONSOLE_BAUD_RATE 115200
72#define DEFAULT_CBAUD B115200
68#endif 73#endif
69 74
70#ifndef CONSOLE_BAUD_RATE 75#ifndef CONSOLE_BAUD_RATE
@@ -90,7 +95,7 @@ static struct tty_driver *mcfrs_serial_driver;
90#undef SERIAL_DEBUG_OPEN 95#undef SERIAL_DEBUG_OPEN
91#undef SERIAL_DEBUG_FLOW 96#undef SERIAL_DEBUG_FLOW
92 97
93#if defined(CONFIG_M527x) || defined(CONFIG_M528x) 98#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)
94#define IRQBASE (MCFINT_VECBASE+MCFINT_UART0) 99#define IRQBASE (MCFINT_VECBASE+MCFINT_UART0)
95#else 100#else
96#define IRQBASE 73 101#define IRQBASE 73
@@ -1510,7 +1515,7 @@ static void mcfrs_irqinit(struct mcf_serial *info)
1510 *portp = (*portp & ~0x000000ff) | 0x00000055; 1515 *portp = (*portp & ~0x000000ff) | 0x00000055;
1511 portp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_PDCNT); 1516 portp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_PDCNT);
1512 *portp = (*portp & ~0x000003fc) | 0x000002a8; 1517 *portp = (*portp & ~0x000003fc) | 0x000002a8;
1513#elif defined(CONFIG_M527x) || defined(CONFIG_M528x) 1518#elif defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)
1514 volatile unsigned char *icrp, *uartp; 1519 volatile unsigned char *icrp, *uartp;
1515 volatile unsigned long *imrp; 1520 volatile unsigned long *imrp;
1516 1521