aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohji Okuno <okuno.kohji@jp.panasonic.com>2019-03-06 13:30:42 +0900
committerShawn Guo <shawnguo@kernel.org>2019-03-20 22:35:29 +0800
commit8f3e2d2c93494333a1e889a68eaed241329be4f8 (patch)
treefedd44915bc444c55c769b864af9a382dcfd3613
parent9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff)
downloadkernel-8f3e2d2c93494333a1e889a68eaed241329be4f8.tar.gz
ARM: imx6: cpuidle: omit the unnecessary unmask of GINT
In imx6_set_lpm, we only need to unmask GINT when not WAIT_CLOCKED, so add a check condition. Signed-off-by: Peng Fan <peng.fan@nxp.com> Signed-off-by: Kohji Okuno <okuno.kohji@jp.panasonic.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
-rw-r--r--arch/arm/mach-imx/pm-imx6.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
index 87f45b926c78..54add0178b96 100644
--- a/arch/arm/mach-imx/pm-imx6.c
+++ b/arch/arm/mach-imx/pm-imx6.c
@@ -354,9 +354,11 @@ int imx6_set_lpm(enum mxc_cpu_pwr_mode mode)
*
* Note that IRQ #32 is GIC SPI #0.
*/
- imx_gpc_hwirq_unmask(0);
+ if (mode != WAIT_CLOCKED)
+ imx_gpc_hwirq_unmask(0);
writel_relaxed(val, ccm_base + CLPCR);
- imx_gpc_hwirq_mask(0);
+ if (mode != WAIT_CLOCKED)
+ imx_gpc_hwirq_mask(0);
return 0;
}