diff options
| author | Mahesh Mahadevan <r9aadq@freescale.com> | 2008-03-13 15:26:21 -0500 |
|---|---|---|
| committer | Daniel Schaeffer <daniel.schaeffer@timesys.com> | 2008-08-25 15:20:44 -0400 |
| commit | 16f2c59210865ce92a97a3dd03f86932660d1c6e (patch) | |
| tree | efac1b2482caa748074652366d60e44ccd5c6c1c /drivers | |
| parent | a52caebf02ce6fe7876ff4c28a932f91ec6d52f3 (diff) | |
ENGR00068609 Update to use UART as wakeup source
Update the code to use UART as wakeup source, the changes are needed as
the serial core driver now includes the code for wakeup
Signed-off-by: Mahesh Mahadevan <r9aadq@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/mxc_uart.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/serial/mxc_uart.c b/drivers/serial/mxc_uart.c index 642a5603c5c9..e03ee08bd148 100644 --- a/drivers/serial/mxc_uart.c +++ b/drivers/serial/mxc_uart.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2004-2008 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -1791,12 +1791,6 @@ static int mxcuart_suspend(struct platform_device *pdev, pm_message_t state) umxc->port.info->tty->hw_stopped = 1; } - if (device_may_wakeup(&pdev->dev)) { - /* UART RTS signal is used as wakeup source */ - writel(MXC_UARTUCR1_RTSDEN, umxc->port.membase + MXC_UARTUCR1); - gpio_uart_active(umxc->port.line, umxc->ir_mode); - } - return 0; } @@ -1820,10 +1814,7 @@ static int mxcuart_resume(struct platform_device *pdev) if (umxc->port.info && umxc->port.info->flags & UIF_INITIALIZED) { umxc->port.info->tty->hw_stopped = 0; } - if (device_may_wakeup(&pdev->dev)) { - writel(0, umxc->port.membase + MXC_UARTUCR1); - gpio_uart_inactive(umxc->port.line, umxc->ir_mode); - } + uart_resume_port(&mxc_reg, &umxc->port); return 0; @@ -1863,7 +1854,6 @@ static int mxcuart_probe(struct platform_device *pdev) uart_add_one_port(&mxc_reg, &mxc_ports[id]->port); platform_set_drvdata(pdev, mxc_ports[id]); - pdev->dev.power.can_wakeup = 1; } return 0; } |