aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2011-04-21 09:08:46 -0400
committerPaul Mundt <lethal@linux-sh.org>2011-05-22 23:22:09 -0400
commit54aa89ea29d7dd7fd414297d4bdc8f6eff905784 (patch)
tree8094f387f015089d649c5f5d115f1e08deba6c9a /drivers/tty
parent5e50d2d622c745d4439fc9a33d932cc3add2318f (diff)
serial: sh-sci: suspend/resume wakeup support V2
This patch adds wakeup support to the sh-sci driver. The serial core deals with all details but defaults to wakeup disabled. So to make use of this feature enable wakeup in sysfs: echo enabled > /sys/class/tty/ttySC0/power/wakeup Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/sh-sci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index bb682c4e72a8..c529580cee93 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1790,7 +1790,7 @@ static int __devinit sci_init_single(struct platform_device *dev,
1790 * 1790 *
1791 * For the muxed case there's nothing more to do. 1791 * For the muxed case there's nothing more to do.
1792 */ 1792 */
1793 port->irq = p->irqs[SCIx_TXI_IRQ]; 1793 port->irq = p->irqs[SCIx_RXI_IRQ];
1794 1794
1795 if (p->dma_dev) 1795 if (p->dma_dev)
1796 dev_dbg(port->dev, "DMA device %p, tx %d, rx %d\n", 1796 dev_dbg(port->dev, "DMA device %p, tx %d, rx %d\n",