Skip to content

Commit

Permalink
tty: serial: fsl_lpuart: support suspend/resume
Browse files Browse the repository at this point in the history
Add suspend/resume support.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
agners authored and gregkh committed Aug 31, 2016
1 parent b70b636 commit d6b0d2f
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions drivers/tty/serial/fsl_lpuart.c
Original file line number Diff line number Diff line change
Expand Up @@ -483,9 +483,8 @@ static void lpuart_dma_rx_complete(void *arg)
spin_unlock_irqrestore(&sport->port.lock, flags);
}

static void lpuart_timer_func(unsigned long data)
static void lpuart_dma_rx_terminate(struct lpuart_port *sport)
{
struct lpuart_port *sport = (struct lpuart_port *)data;
struct tty_port *port = &sport->port.state->port;
struct dma_tx_state state;
unsigned long flags;
Expand All @@ -510,6 +509,11 @@ static void lpuart_timer_func(unsigned long data)
spin_unlock_irqrestore(&sport->port.lock, flags);
}

static void lpuart_timer_func(unsigned long data)
{
lpuart_dma_rx_terminate((struct lpuart_port *)data);
}

static inline void lpuart_prepare_rx(struct lpuart_port *sport)
{
unsigned long flags;
Expand Down Expand Up @@ -1931,7 +1935,12 @@ static int lpuart_suspend(struct device *dev)
writeb(temp, sport->port.membase + UARTCR2);
}

if (sport->dma_rx_in_progress)
lpuart_dma_rx_terminate(sport);

uart_suspend_port(&lpuart_reg, &sport->port);
if (sport->port.suspended && !sport->port.irq_wake)
clk_disable_unprepare(sport->clk);

return 0;
}
Expand All @@ -1941,6 +1950,9 @@ static int lpuart_resume(struct device *dev)
struct lpuart_port *sport = dev_get_drvdata(dev);
unsigned long temp;

if (sport->port.suspended && !sport->port.irq_wake)
clk_prepare_enable(sport->clk);

if (sport->lpuart32) {
lpuart32_setup_watermark(sport);
temp = lpuart32_read(sport->port.membase + UARTCTRL);
Expand Down

0 comments on commit d6b0d2f

Please sign in to comment.