diff mbox

[1/1] ARM: mach-imx: pm-imx6: add missing BM_CLPCR_BYP_MMDC_CH0_LPM_HS setting for imx6ul

Message ID 1470731083-26213-1-git-send-email-peter.chen@nxp.com (mailing list archive)
State New, archived
Headers show

Commit Message

Peter Chen Aug. 9, 2016, 8:24 a.m. UTC
There is a missing BM_CLPCR_BYP_MMDC_CH0_LPM_HS setting for imx6ul,
without it, the "standby" mode can't work well, the system can't be
resumed.

With this commit, the "standby" mode works well.

Cc: Anson Huang <anson.huang@nxp.com>
Cc: <stable@vger.kernel.org>
Fixes: ee4a5f838c84 ("ARM: imx: add suspend/resume support for i.mx6ul")
Signed-off-by: Peter Chen <peter.chen@nxp.com>
---
 arch/arm/mach-imx/pm-imx6.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Fabio Estevam Aug. 9, 2016, 1:29 p.m. UTC | #1
Hi Peter,

On Tue, Aug 9, 2016 at 5:24 AM, Peter Chen <peter.chen@nxp.com> wrote:
> There is a missing BM_CLPCR_BYP_MMDC_CH0_LPM_HS setting for imx6ul,
> without it, the "standby" mode can't work well, the system can't be
> resumed.
>
> With this commit, the "standby" mode works well.

Have you tested 'echo mem > /sys/power/state' as well?

On my tests it does a reboot rather than going to suspend.

Thanks
Peter Chen Aug. 10, 2016, 1:24 a.m. UTC | #2
>
>On Tue, Aug 9, 2016 at 5:24 AM, Peter Chen <peter.chen@nxp.com> wrote:
>> There is a missing BM_CLPCR_BYP_MMDC_CH0_LPM_HS setting for imx6ul,
>> without it, the "standby" mode can't work well, the system can't be
>> resumed.
>>
>> With this commit, the "standby" mode works well.
>
>Have you tested 'echo mem > /sys/power/state' as well?
>
>On my tests it does a reboot rather than going to suspend.
>

It is another issue, current both 6sx and 6ul can't work for mem mode.
But I just can't wake up system, reboot is not observed.

Peter
Shawn Guo Aug. 15, 2016, 1:12 p.m. UTC | #3
On Tue, Aug 09, 2016 at 04:24:43PM +0800, Peter Chen wrote:
> There is a missing BM_CLPCR_BYP_MMDC_CH0_LPM_HS setting for imx6ul,
> without it, the "standby" mode can't work well, the system can't be
> resumed.
> 
> With this commit, the "standby" mode works well.
> 
> Cc: Anson Huang <anson.huang@nxp.com>
> Cc: <stable@vger.kernel.org>
> Fixes: ee4a5f838c84 ("ARM: imx: add suspend/resume support for i.mx6ul")
> Signed-off-by: Peter Chen <peter.chen@nxp.com>

Applied, thanks.
diff mbox

Patch

diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
index 58924b3..67bab74 100644
--- a/arch/arm/mach-imx/pm-imx6.c
+++ b/arch/arm/mach-imx/pm-imx6.c
@@ -295,7 +295,7 @@  int imx6_set_lpm(enum mxc_cpu_pwr_mode mode)
 		val &= ~BM_CLPCR_SBYOS;
 		if (cpu_is_imx6sl())
 			val |= BM_CLPCR_BYPASS_PMIC_READY;
-		if (cpu_is_imx6sl() || cpu_is_imx6sx())
+		if (cpu_is_imx6sl() || cpu_is_imx6sx() || cpu_is_imx6ul())
 			val |= BM_CLPCR_BYP_MMDC_CH0_LPM_HS;
 		else
 			val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS;