diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-08-17 18:53:24 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-08-17 18:53:24 -0700 |
| commit | 774f16c06ecdb9237b31205799d718f49f97b5ad (patch) | |
| tree | 5ffdfa898ae3e74428f06a36e6eb3c275fb8fa7a | |
| parent | 25be1485dd998e926bb95c6611e06b0136c0bb0a (diff) | |
| download | olio-linux-3.10-774f16c06ecdb9237b31205799d718f49f97b5ad.tar.xz olio-linux-3.10-774f16c06ecdb9237b31205799d718f49f97b5ad.zip | |
The broadcom chip used by Olio doesn't really need runtime power management, at least not in it's current form. So, I'm hiding that code for now.
Change-Id: I28e08a86350e88107b82e47a2e9bf7c873600ae9
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index a9c37ae9b2a..ddcd3d13042 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -1837,6 +1837,7 @@ static int serial_omap_runtime_suspend(struct device *dev) spin_unlock_irqrestore(&up->delayed_rts_lock, flags); } +#ifdef OLIO_RUNTIME_PM /* OLIO */ else if (up->rts_wait) { spin_lock_irqsave(&up->delayed_rts_lock, flags); @@ -1844,6 +1845,7 @@ static int serial_omap_runtime_suspend(struct device *dev) up->need_delayed_rts = 0; spin_unlock_irqrestore(&up->delayed_rts_lock, flags); } +#endif up->context_loss_cnt = serial_omap_get_context_loss_count(up); @@ -1881,6 +1883,8 @@ static int serial_omap_runtime_resume(struct device *dev) else pinctrl_select_state(up->pins, up->pin_default); } + +#ifdef OLIO_RUNTIME_PM else if (up->rts_wait) { if (up->is_suspending) up->need_delayed_rts = 1; @@ -1888,6 +1892,8 @@ static int serial_omap_runtime_resume(struct device *dev) up->port.ops->rts_enable(&(up->port)); } } +#endif + return 0; } #endif |