From: Kohji Okuno <okuno.kohji@jp.panasonic.com>
Date: Wed, 6 Mar 2019 04:30:42 +0000 (+0900)
Subject: ARM: imx6: cpuidle: omit the unnecessary unmask of GINT
X-Git-Tag: v5.2-rc1~46^2~2^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8f3e2d2c93494333a1e889a68eaed241329be4f8;p=linux.git

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>
---

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;
 }