Fixes common/cmd_flash.c:

[karo-tx-uboot.git] / drivers / ns16550.c

diff --git a/drivers/ns16550.c b/drivers/ns16550.c
index b20ae4b2d5162cd127bc1934250c491175e88e71..2429464d89656f167480ba0efc4af7fb4584adf0 100644 (file)
--- a/drivers/ns16550.c
+++ b/drivers/ns16550.c
@@ -17,8 +17,8 @@
 void NS16550_init (NS16550_t com_port, int baud_divisor)
 {
        com_port->ier = 0x00;
-#ifdef CONFIG_OMAP1510
-       com_port->mdr1 = 0x7;   /* mode select reset TL16C750*/
+#ifdef CONFIG_OMAP
+       com_port->mdr1 = 0x7;   /* mode select reset TL16C750*/
 #endif
        com_port->lcr = LCR_BKSE | LCRVAL;
        com_port->dll = baud_divisor & 0xff;
@@ -26,10 +26,13 @@ void NS16550_init (NS16550_t com_port, int baud_divisor)
        com_port->lcr = LCRVAL;
        com_port->mcr = MCRVAL;
        com_port->fcr = FCRVAL;
-#ifdef CONFIG_OMAP1510
-       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
-
 }
 
 void NS16550_reinit (NS16550_t com_port, int baud_divisor)
@@ -51,7 +54,12 @@ void NS16550_putc (NS16550_t com_port, char c)
 
 char NS16550_getc (NS16550_t com_port)
 {
-       while ((com_port->lsr & LSR_DR) == 0);
+       while ((com_port->lsr & LSR_DR) == 0) {
+#ifdef CONFIG_USB_TTY
+               extern void usbtty_poll(void);
+               usbtty_poll();
+#endif
+       }
        return (com_port->rbr);
 }