Merge tag 'imx-soc-5.2' of...

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>

arch/arm/mach-imx/pm-imx6.c

@@ -354,8 +354,10 @@ int imx6_set_lpm(enum mxc_cpu_pwr_mode mode)
 	 *
 	 * Note that IRQ #32 is GIC SPI #0.
 	 */
+	if (mode != WAIT_CLOCKED)
 		imx_gpc_hwirq_unmask(0);
 	writel_relaxed(val, ccm_base + CLPCR);
+	if (mode != WAIT_CLOCKED)
 		imx_gpc_hwirq_mask(0);
 
 	return 0;