From 8b2c2c417b14e5df43e9dc8448ca22855428ae07 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Thu, 10 Nov 2011 00:44:01 +0100
Subject: [PATCH] --- yaml --- r: 275618 b: refs/heads/master c:
 056879d2f244001b2888cdc8cf868c33ca8b23a0 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/arm/mach-shmobile/pm-sh7372.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bb30f5ee49c3..ac9ccd0391fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be2658ffe1d2a4ab4e045b22a317459595abc2c4
+refs/heads/master: 056879d2f244001b2888cdc8cf868c33ca8b23a0
diff --git a/trunk/arch/arm/mach-shmobile/pm-sh7372.c b/trunk/arch/arm/mach-shmobile/pm-sh7372.c
index e26138352f07..78c98a847433 100644
--- a/trunk/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/trunk/arch/arm/mach-shmobile/pm-sh7372.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/irq.h>
 #include <linux/bitrev.h>
+#include <linux/console.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/tlbflush.h>
@@ -469,6 +470,11 @@ void __init sh7372_pm_init(void)
 	/* do not convert A3SM, A3SP, A3SG, A4R power down into A4S */
 	__raw_writel(0, PDNSEL);
 
+	/* serial consoles make use of SCIF hardware located in A3SP,
+	 * keep such power domain on if "no_console_suspend" is set.
+	 */
+	sh7372_a3sp.stay_on = !console_suspend_enabled;
+
 	sh7372_suspend_init();
 	sh7372_cpuidle_init();
 }