X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=drivers%2Fns16550.c;h=2429464d89656f167480ba0efc4af7fb4584adf0;hb=4a8527ef086ec7c89f40674ef024ae6f988a614a;hp=6f818d774b862afc6f85ebd440f0b6b0e0f02685;hpb=e85390dc1d9c3c942c11bbf003e6c10a73e25ed6;p=oweals%2Fu-boot.git

diff --git a/drivers/ns16550.c b/drivers/ns16550.c
index 6f818d774b..2429464d89 100644
--- a/drivers/ns16550.c
+++ b/drivers/ns16550.c
@@ -17,12 +17,22 @@
 void NS16550_init (NS16550_t com_port, int baud_divisor)
 {
 	com_port->ier = 0x00;
+#ifdef CONFIG_OMAP
+	com_port->mdr1 = 0x7;	/* mode select reset TL16C750*/
+#endif
 	com_port->lcr = LCR_BKSE | LCRVAL;
 	com_port->dll = baud_divisor & 0xff;
 	com_port->dlm = (baud_divisor >> 8) & 0xff;
 	com_port->lcr = LCRVAL;
 	com_port->mcr = MCRVAL;
 	com_port->fcr = FCRVAL;
+#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)
@@ -44,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);
 }