summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2011-11-10 00:44:01 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2011-11-10 00:44:01 +0100
commit056879d2f244001b2888cdc8cf868c33ca8b23a0 (patch)
tree4a51bc4eddd13bb5797e02e94eb5d15e74903d4b /arch
parentbe2658ffe1d2a4ab4e045b22a317459595abc2c4 (diff)
downloadop-kernel-dev-056879d2f244001b2888cdc8cf868c33ca8b23a0.zip
op-kernel-dev-056879d2f244001b2888cdc8cf868c33ca8b23a0.tar.gz
ARM: mach-shmobile: sh7372 A3SP no_suspend_console fix
If "no_suspend_irq" is used on the sh7372 Mackerel board with v3.2-rc1 then Suspend-to-RAM fails because the serial console tries to write to the SCIF driver even though the power domain is turned off. This patch checks the state of "console_suspend_enabled" to see if A3SP should be forced enabled. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-shmobile/pm-sh7372.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index e261383..78c98a8 100644
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/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();
}
OpenPOWER on IntegriCloud