diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2015-12-12 10:07:31 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-12-21 14:27:44 +0100 |
| commit | 23de9e55818a92c7158c0a9e9a04c00c632d1ada (patch) | |
| tree | 7dd983bddc871097ac62e2b536fdb1553fa5ad23 | |
| parent | 681221bb098bdb8fb845f0ae1d252c02f80539fb (diff) | |
pm-imx6.c: fix power off by stop mode
With the 3.14.28 release of the kernel imx6_stop_mode_poweroff() does not
enter stop mode.
Thus the function does not switch of power but returns.
This seems to be caused by the second processor which has been stopped.
Set the WFI event mask for the stopped processor works around the issue.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry-picked from commit 2acff0eaece38533e85e08431e7ae9f3027c677a)
(cherry picked from commit 894914718e9e563eb601e0090e1ae2ddadf426a9)
| -rw-r--r-- | arch/arm/mach-imx/pm-imx6.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c index 7bbc6bf085db..928235a2e13e 100644 --- a/arch/arm/mach-imx/pm-imx6.c +++ b/arch/arm/mach-imx/pm-imx6.c @@ -1268,7 +1268,22 @@ void __init imx6_pm_ccm_init(const char *ccm_compat) void imx6_stop_mode_poweroff(void) { - imx6_set_lpm(STOP_POWER_OFF); + /* compare with imx6q_set_lpm */ + u32 val = readl_relaxed(ccm_base + CLPCR); + + val &= ~BM_CLPCR_LPM; + /* mask the stopped processor, otherwise we will not enter stop mode */ + val |= smp_processor_id() ? BM_CLPCR_MASK_CORE0_WFI : BM_CLPCR_MASK_CORE1_WFI; + val |= 0x2 << BP_CLPCR_LPM; + val |= 0x3 << BP_CLPCR_STBY_COUNT; + val |= BM_CLPCR_VSTBY; + val |= BM_CLPCR_SBYOS; + val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS; + + imx_gpc_hwirq_unmask(0); + writel_relaxed(val, ccm_base + CLPCR); + imx_gpc_hwirq_mask(0); + imx_gpc_mask_all(); cpu_do_idle(); } |