summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/serial.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@deeprootsystems.com>2010-09-27 20:20:06 +0530
committerKevin Hilman <khilman@deeprootsystems.com>2010-09-29 12:42:58 -0700
commit8da37d9dc52befa8b55bdc20eef2a4aaf20e0c8d (patch)
treed0e9702f203263bddb91439b09c7a1be0ded361a /arch/arm/mach-omap2/serial.c
parent3244fcd227526a2f21018a280c7af0a9219c6ff4 (diff)
downloadblackbird-op-linux-8da37d9dc52befa8b55bdc20eef2a4aaf20e0c8d.tar.gz
blackbird-op-linux-8da37d9dc52befa8b55bdc20eef2a4aaf20e0c8d.zip
OMAP: UART: use non-locking versions of hwmod enable/idle functions
Since the UART enable/idle is done during the idle path (with interrupts disabled), use the non-locking versions of the hwmod enable/idle functions. Signed-off-by: Govindraj.R <govindraj.raja@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-omap2/serial.c')
-rw-r--r--arch/arm/mach-omap2/serial.c23
1 files changed, 21 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index ff83e91e6109..72b5c9896390 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -105,10 +105,29 @@ struct omap_uart_state {
static LIST_HEAD(uart_list);
static u8 num_uarts;
+/*
+ * Since these idle/enable hooks are used in the idle path itself
+ * which has interrupts disabled, use the non-locking versions of
+ * the hwmod enable/disable functions.
+ */
+static int uart_idle_hwmod(struct omap_device *od)
+{
+ _omap_hwmod_idle(od->hwmods[0]);
+
+ return 0;
+}
+
+static int uart_enable_hwmod(struct omap_device *od)
+{
+ _omap_hwmod_enable(od->hwmods[0]);
+
+ return 0;
+}
+
static struct omap_device_pm_latency omap_uart_latency[] = {
{
- .deactivate_func = omap_device_idle_hwmods,
- .activate_func = omap_device_enable_hwmods,
+ .deactivate_func = uart_idle_hwmod,
+ .activate_func = uart_enable_hwmod,
.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
},
};
OpenPOWER on IntegriCloud