From: Jason Liu <r64343@freescale.com>
Date: Tue, 17 Apr 2012 11:08:00 +0000 (+0800)
Subject: ENGR00179851: i.mx6dl: map the MEM mode to STANDBY mode
X-Git-Tag: v3.0.35-fsl_4.1.0~1327
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4490e7429f09f81c736b983564f39fe81984922f;p=karo-tx-linux.git

ENGR00179851: i.mx6dl: map the MEM mode to STANDBY mode

Due to i.mx6dl TO1.0(TKT094231), Suspend/resume cannot work
stable under deep sleep mode(Dormant, MEM MODE) thus we need
map the MEM mode to STANBY mode(ARM will not power off), this
issue will be fixed on TO1.1

Signed-off-by: Jason Liu <r64343@freescale.com>
---

diff --git a/arch/arm/mach-mx6/pm.c b/arch/arm/mach-mx6/pm.c
index 76a2c8dca50e..0d611e2aad55 100644
--- a/arch/arm/mach-mx6/pm.c
+++ b/arch/arm/mach-mx6/pm.c
@@ -293,6 +293,12 @@ static int mx6_suspend_enter(suspend_state_t state)
 	}
 	mx6_suspend_store();
 
+	/* i.MX6dl TO1.0 TKT094231: can't support ARM_POWER_OFF mode */
+	if (state == PM_SUSPEND_MEM &&
+		(mx6dl_revision() == IMX_CHIP_REVISION_1_0)) {
+		state = PM_SUSPEND_STANDBY;
+	}
+
 	switch (state) {
 	case PM_SUSPEND_MEM:
 		gpu_power_down();