OSDN Git Service

ARM: imx6: cpuidle: omit the unnecessary unmask of GINT
authorKohji Okuno <okuno.kohji@jp.panasonic.com>
Wed, 6 Mar 2019 04:30:42 +0000 (13:30 +0900)
committerShawn Guo <shawnguo@kernel.org>
Wed, 20 Mar 2019 14:35:29 +0000 (22:35 +0800)
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>
arch/arm/mach-imx/pm-imx6.c

index 87f45b9..54add01 100644 (file)
@@ -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;
 }