---

yaml --- r: 275618 b: refs/heads/master c: 056879d h: refs/heads/master v: v3
git-mirror · Nov 9, 2011 · 8b2c2c4 · 8b2c2c4
1 parent b8f55bf
commit 8b2c2c4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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();
 }