diff options
author | Kohji Okuno <okuno.kohji@jp.panasonic.com> | 2019-03-05 23:30:42 -0500 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2019-03-20 10:35:29 -0400 |
commit | 8f3e2d2c93494333a1e889a68eaed241329be4f8 (patch) | |
tree | fedd44915bc444c55c769b864af9a382dcfd3613 | |
parent | 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff) |
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.c | 6 |
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) | |||
354 | * | 354 | * |
355 | * Note that IRQ #32 is GIC SPI #0. | 355 | * Note that IRQ #32 is GIC SPI #0. |
356 | */ | 356 | */ |
357 | imx_gpc_hwirq_unmask(0); | 357 | if (mode != WAIT_CLOCKED) |
358 | imx_gpc_hwirq_unmask(0); | ||
358 | writel_relaxed(val, ccm_base + CLPCR); | 359 | writel_relaxed(val, ccm_base + CLPCR); |
359 | imx_gpc_hwirq_mask(0); | 360 | if (mode != WAIT_CLOCKED) |
361 | imx_gpc_hwirq_mask(0); | ||
360 | 362 | ||
361 | return 0; | 363 | return 0; |
362 | } | 364 | } |