summaryrefslogtreecommitdiff
path: root/drivers/serial
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/serial')
-rwxr-xr-x[-rw-r--r--]drivers/serial/serial_pl01x.c5
-rw-r--r--drivers/serial/usbtty.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index c645cef87..839b0a812 100644..100755
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -144,6 +144,11 @@ int serial_init (void)
IO_WRITE (port[CONSOLE_PORT] + UART_PL011_LCRH,
(UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN));
+#ifdef CONFIG_U8500
+ /* program receive line control register */
+ IO_WRITE(port[CONSOLE_PORT] + 0x1C, 0x70);
+#endif
+
/*
** Finally, enable the UART
*/
diff --git a/drivers/serial/usbtty.h b/drivers/serial/usbtty.h
index 6b6c4a162..adb7685a6 100644
--- a/drivers/serial/usbtty.h
+++ b/drivers/serial/usbtty.h
@@ -27,6 +27,8 @@
#include <usbdevice.h>
#if defined(CONFIG_PPC)
#include <usb/mpc8xx_udc.h>
+#elif defined(CONFIG_MUSB)
+#include <usb/musb_udc.h>
#elif defined(CONFIG_OMAP1510)
#include <usb/omap1510_udc.h>
#elif defined(CONFIG_MUSB_UDC)