#define UART_OMAP_EFR2                 0x23
 #define UART_OMAP_EFR2_TIMEOUT_BEHAVE  BIT(6)
 
+/* RX FIFO occupancy indicator */
+#define UART_OMAP_RX_LVL               0x64
+
 struct omap8250_priv {
        int line;
        u8 habit;
        serial8250_rpm_get(up);
        iir = serial_port_in(port, UART_IIR);
        ret = serial8250_handle_irq(port, iir);
+       /*
+        * It is possible that RX TIMEOUT is signalled after FIFO
+        * has been drained, in which case a dummy read of RX FIFO is
+        * required to clear RX TIMEOUT condition.
+        */
+       if ((iir & UART_IIR_RX_TIMEOUT) == UART_IIR_RX_TIMEOUT) {
+               if (serial_port_in(port, UART_OMAP_RX_LVL) == 0)
+                       serial_port_in(port, UART_RX);
+       }
        serial8250_rpm_put(up);
 
        return IRQ_RETVAL(ret);