OMAP2+: UART: enable tx wakeup bit for wer reg

wer has TX wakeup bit available enable the same
by populating the necessary tx wakeup flag for the
applicable module ip blocks and use the same
while configuaring wer reg.

Also wer is not context restored, restore wer when
context is lost.

Cc: Paul Walmsley <paul@pwsan.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Kevin Hilman <kevin.hilman@linaro.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(for drivers/tty changes)
Signed-off-by: Govindraj.R <govindraj.raja@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index eacb0def3d96f694b44ab81f5d339e54cbd971ac..33c758e09d86ba63ab763cc498b52325dd449542 100644 (file)
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -51,6 +51,11 @@
 #define OMAP_UART_REV_52 0x0502
 #define OMAP_UART_REV_63 0x0603
 
+#define OMAP_UART_TX_WAKEUP_EN         BIT(7)
+
+/* Feature flags */
+#define OMAP_UART_WER_HAS_TX_WAKEUP    BIT(0)
+
 #define UART_ERRATA_i202_MDR1_ACCESS   BIT(0)
 #define UART_ERRATA_i291_DMA_FORCEIDLE BIT(1)
 
@@ -136,6 +141,7 @@ struct uart_omap_port {
        unsigned char           dlh;
        unsigned char           mdr1;
        unsigned char           scr;
+       unsigned char           wer;
 
        int                     use_dma;
        /*
@@ -150,6 +156,7 @@ struct uart_omap_port {
        int                     context_loss_cnt;
        u32                     errata;
        u8                      wakeups_enabled;
+       u32                     features;
 
        int                     DTR_gpio;
        int                     DTR_inverted;
@@ -681,7 +688,11 @@ static int serial_omap_startup(struct uart_port *port)
        serial_out(up, UART_IER, up->ier);
 
        /* Enable module level wake up */
-       serial_out(up, UART_OMAP_WER, OMAP_UART_WER_MOD_WKUP);
+       up->wer = OMAP_UART_WER_MOD_WKUP;
+       if (up->features & OMAP_UART_WER_HAS_TX_WAKEUP)
+               up->wer |= OMAP_UART_TX_WAKEUP_EN;
+
+       serial_out(up, UART_OMAP_WER, up->wer);
 
        pm_runtime_mark_last_busy(up->dev);
        pm_runtime_put_autosuspend(up->dev);
@@ -1371,9 +1382,11 @@ static void omap_serial_fill_features_erratas(struct uart_omap_port *up)
        case OMAP_UART_REV_52:
                up->errata |= (UART_ERRATA_i202_MDR1_ACCESS |
                                UART_ERRATA_i291_DMA_FORCEIDLE);
+               up->features |= OMAP_UART_WER_HAS_TX_WAKEUP;
                break;
        case OMAP_UART_REV_63:
                up->errata |= UART_ERRATA_i202_MDR1_ACCESS;
+               up->features |= OMAP_UART_WER_HAS_TX_WAKEUP;
                break;
        default:
                break;
@@ -1600,6 +1613,7 @@ static void serial_omap_restore_context(struct uart_omap_port *up)
                serial_omap_mdr1_errataset(up, up->mdr1);
        else
                serial_out(up, UART_OMAP_MDR1, up->mdr1);
+       serial_out(up, UART_OMAP_WER, up->wer);
 }
 
 static int serial_omap_runtime_suspend(struct device *dev)