diff options
| author | Kevin Hilman <khilman@deeprootsystems.com> | 2010-09-27 20:19:53 +0530 |
|---|---|---|
| committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-09-29 12:42:58 -0700 |
| commit | 3244fcd227526a2f21018a280c7af0a9219c6ff4 (patch) | |
| tree | 5c99bcb6e97df85ef5d597565e40b028711c6b47 | |
| parent | c04ede382a64020f19e9aa23a85493a09af945d3 (diff) | |
| download | linux-stable-3244fcd227526a2f21018a280c7af0a9219c6ff4.tar.gz linux-stable-3244fcd227526a2f21018a280c7af0a9219c6ff4.tar.bz2 linux-stable-3244fcd227526a2f21018a280c7af0a9219c6ff4.zip | |
OMAP: UART: don't do automatic bus-level suspend/resume
Since the omap_device for UART is currently managed inside the idle
path itself, don't let the bus-level code suspend/resume the UART.
To prevent this, pm_runtime_get() is used when preparing for suspend
and pm_runtime_put() is used when finished with suspend.
Signed-off-by: Govindraj.R <govindraj.raja@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
| -rw-r--r-- | arch/arm/mach-omap2/serial.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 6ffbc924c4d4..ff83e91e6109 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -26,6 +26,7 @@ #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/serial_8250.h> +#include <linux/pm_runtime.h> #ifdef CONFIG_SERIAL_OMAP #include <plat/omap-serial.h> @@ -530,14 +531,17 @@ void omap_uart_enable_irqs(int enable) struct omap_uart_state *uart; list_for_each_entry(uart, &uart_list, node) { - if (enable) + if (enable) { + pm_runtime_put_sync(&uart->pdev->dev); ret = request_threaded_irq(uart->irq, NULL, omap_uart_interrupt, IRQF_SHARED, "serial idle", (void *)uart); - else + } else { + pm_runtime_get_noresume(&uart->pdev->dev); free_irq(uart->irq, (void *)uart); + } } } |