[PATCH] Clean up Katmai (440SPe) linker script

[u-boot] / drivers / ns16550.c

diff --git a/drivers/ns16550.c b/drivers/ns16550.c
index 05862ee6ec65dadededacf8531c66ee7786d6767..2429464d89656f167480ba0efc4af7fb4584adf0 100644 (file)
--- a/drivers/ns16550.c
+++ b/drivers/ns16550.c
@@ -17,7 +17,7 @@
 void NS16550_init (NS16550_t com_port, int baud_divisor)
 {
        com_port->ier = 0x00;
-#ifdef CONFIG_OMAP1510
+#ifdef CONFIG_OMAP
        com_port->mdr1 = 0x7;   /* mode select reset TL16C750*/
 #endif
        com_port->lcr = LCR_BKSE | LCRVAL;
@@ -26,8 +26,12 @@ void NS16550_init (NS16550_t com_port, int baud_divisor)
        com_port->lcr = LCRVAL;
        com_port->mcr = MCRVAL;
        com_port->fcr = FCRVAL;
-#if defined(CONFIG_OMAP1510) || defined(CONFIG_OMAP1610)
-       com_port->mdr1 = 0;     /* select uart mode */
+#if defined(CONFIG_OMAP)
+#if defined(CONFIG_APTIX)
+       com_port->mdr1 = 3;     /* /13 mode so Aptix 6MHz can hit 115200 */
+#else
+       com_port->mdr1 = 0;     /* /16 is proper to hit 115200 with 48MHz */
+#endif
 #endif
 }