diff options
author | Denys Drozdov <denys.drozdov@toradex.com> | 2021-11-08 13:55:11 +0200 |
---|---|---|
committer | Denys Drozdov <denys.drozdov@toradex.com> | 2021-11-08 13:55:11 +0200 |
commit | 50d0d350e8533a792d543e62d8443f4d34757ab1 (patch) | |
tree | fa52052a3dbd3d5e8a57a19ae82f8f40aded8b3b /arch/arm/mach-imx | |
parent | b101fdeb4c9fc20ffae06e425649ccfcc1062e22 (diff) | |
parent | 940a14a7d844386c72f449045080dbbd86d1d244 (diff) |
Merge tag 'v5.4.153' into 5.4-2.3.x-imx
This is the 5.4.153 stable release
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r-- | arch/arm/mach-imx/pm-imx6.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c index df767169ad2c..a77289a33c89 100644 --- a/arch/arm/mach-imx/pm-imx6.c +++ b/arch/arm/mach-imx/pm-imx6.c @@ -9,6 +9,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> @@ -1257,6 +1258,29 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata IMX6Q_GPR1_GINT); } +static void imx6_pm_stby_poweroff(void) +{ + gic_cpu_if_down(0); + imx6_set_lpm(STOP_POWER_OFF); + imx6q_suspend_finish(0); + + mdelay(1000); + + pr_emerg("Unable to poweroff system\n"); +} + +static int imx6_pm_stby_poweroff_probe(void) +{ + if (pm_power_off) { + pr_warn("%s: pm_power_off already claimed %p %ps!\n", + __func__, pm_power_off, pm_power_off); + return -EBUSY; + } + + pm_power_off = imx6_pm_stby_poweroff; + return 0; +} + void __init imx6_pm_ccm_init(const char *ccm_compat) { struct device_node *np; |