aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorOleksij Rempel <o.rempel@pengutronix.de>2021-09-28 15:49:40 +0200
committerShawn Guo <shawnguo@kernel.org>2021-10-05 13:58:25 +0800
commit783f3db030563f7bcdfe2d26428af98ea1699a8e (patch)
treee2a6ba51d4011989099c1000a9e127e95a62f6cf /arch
parentarm64: dts: ls1028a: fix eSDHC2 node (diff)
downloadlinux-dev-783f3db030563f7bcdfe2d26428af98ea1699a8e.tar.xz
linux-dev-783f3db030563f7bcdfe2d26428af98ea1699a8e.zip
ARM: imx6: disable the GIC CPU interface before calling stby-poweroff sequence
Any pending interrupt can prevent entering standby based power off state. To avoid it, disable the GIC CPU interface. Fixes: 8148d2136002 ("ARM: imx6: register pm_power_off handler if "fsl,pmic-stby-poweroff" is set") Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/pm-imx6.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
index 9244437cb1b9..f2ecca339910 100644
--- a/arch/arm/mach-imx/pm-imx6.c
+++ b/arch/arm/mach-imx/pm-imx6.c
@@ -10,6 +10,7 @@
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/genalloc.h>
+#include <linux/irqchip/arm-gic.h>
#include <linux/mfd/syscon.h>
#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
#include <linux/of.h>
@@ -619,6 +620,7 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata
static void imx6_pm_stby_poweroff(void)
{
+ gic_cpu_if_down(0);
imx6_set_lpm(STOP_POWER_OFF);
imx6q_suspend_finish(0);