mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-30 08:02:30 +00:00
Code Issues Releases Wiki Activity

tty: serial: fsl_lpuart: support suspend/resume

Browse source 
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>
This commit is contained in:
Stefan Agner 2016-07-19 13:13:04 +05:30 committed by Greg Kroah-Hartman
parent b70b636186
commit d6b0d2f243
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/tty/serial/fsl_lpuart.c
View file

@ -483,9 +483,8 @@ static void lpuart_dma_rx_complete(void *arg)
spin_unlock_irqrestore(&sport->port.lock, flags); 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 tty_port *port = &sport->port.state->port;
struct dma_tx_state state; struct dma_tx_state state;
unsigned long flags; unsigned long flags;
@ -510,6 +509,11 @@ static void lpuart_timer_func(unsigned long data)
spin_unlock_irqrestore(&sport->port.lock, flags); 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) static inline void lpuart_prepare_rx(struct lpuart_port *sport)
{ {
unsigned long flags; unsigned long flags;
@ -1931,7 +1935,12 @@ static int lpuart_suspend(struct device *dev)
writeb(temp, sport->port.membase + UARTCR2); writeb(temp, sport->port.membase + UARTCR2);
} }
if (sport->dma_rx_in_progress)
lpuart_dma_rx_terminate(sport);
uart_suspend_port(&lpuart_reg, &sport->port); uart_suspend_port(&lpuart_reg, &sport->port);
if (sport->port.suspended && !sport->port.irq_wake)
clk_disable_unprepare(sport->clk);
return 0; return 0;
} }
@ -1941,6 +1950,9 @@ static int lpuart_resume(struct device *dev)
struct lpuart_port *sport = dev_get_drvdata(dev); struct lpuart_port *sport = dev_get_drvdata(dev);
unsigned long temp; unsigned long temp;
if (sport->port.suspended && !sport->port.irq_wake)
clk_prepare_enable(sport->clk);
if (sport->lpuart32) { if (sport->lpuart32) {
lpuart32_setup_watermark(sport); lpuart32_setup_watermark(sport);
temp = lpuart32_read(sport->port.membase + UARTCTRL); temp = lpuart32_read(sport->port.membase + UARTCTRL);