summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-04-29 19:26:04 +0300
committerOlof Johansson <olof@lixom.net>2019-04-29 19:26:04 +0300
commitffb832b4bb173ff6b701d2f82dfa5fe8d9f3fe9a (patch)
treef632258a4e48ddfa1792cbb8decaec86a197144f
parente165908fac8960e032da32cd300e8069553f82eb (diff)
parent8f3e2d2c93494333a1e889a68eaed241329be4f8 (diff)
downloadlinux-ffb832b4bb173ff6b701d2f82dfa5fe8d9f3fe9a.tar.xz
Merge tag 'imx-soc-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/soc
i.MX SoC update for 5.2: - Optimize i.MX6 cpuidle driver a little bit by omitting the unnecessary unmask of GINT for WAIT_CLOCKED mode. * tag 'imx-soc-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx6: cpuidle: omit the unnecessary unmask of GINT Signed-off-by: Olof Johansson <olof@lixom.net>
-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;
}