1 files changed, 6 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 3771254dfa81..804dbb21cee2 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -74,6 +74,7 @@ struct omap_uart_state {
         u16 sysc;
         u16 scr;
         u16 wer;
+        u16 mcr;
 #endif
 };
 
@@ -197,6 +198,9 @@ static void omap_uart_save_context(struct omap_uart_state *uart)
         uart->sysc = serial_read_reg(p, UART_OMAP_SYSC);
         uart->scr = serial_read_reg(p, UART_OMAP_SCR);
         uart->wer = serial_read_reg(p, UART_OMAP_WER);
+        serial_write_reg(p, UART_LCR, 0x80);
+        uart->mcr = serial_read_reg(p, UART_MCR);
+        serial_write_reg(p, UART_LCR, lcr);
 
         uart->context_valid = 1;
 }
@@ -225,6 +229,8 @@ static void omap_uart_restore_context(struct omap_uart_state *uart)
         serial_write_reg(p, UART_DLM, uart->dlh);
         serial_write_reg(p, UART_LCR, 0x0); /* Operational mode */
         serial_write_reg(p, UART_IER, uart->ier);
+        serial_write_reg(p, UART_LCR, 0x80);
+        serial_write_reg(p, UART_MCR, uart->mcr);
         serial_write_reg(p, UART_FCR, 0xA1);
         serial_write_reg(p, UART_LCR, 0xBF); /* Config B mode */
         serial_write_reg(p, UART_EFR, efr);