diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-12-11 16:43:07 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-02-09 22:45:38 +0100 |
| commit | 74bdc2a0856337e38e6ef24ee17ab39d0c5637e2 (patch) | |
| tree | ce82b901c89f8db4e6572daf9be90da6ed24d65a /arch/arm/mach-imx/pm-imx6.c | |
| parent | 897c8890dd5e5cb980bc8138d435b43d71eb2712 (diff) | |
arm: imx: fix handling power stuff without psci
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'arch/arm/mach-imx/pm-imx6.c')
| -rw-r--r-- | arch/arm/mach-imx/pm-imx6.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c index a1f11a0184d3..8fd1f7188725 100644 --- a/arch/arm/mach-imx/pm-imx6.c +++ b/arch/arm/mach-imx/pm-imx6.c @@ -757,10 +757,12 @@ int imx6_set_lpm(enum mxc_cpu_pwr_mode mode) static int imx6q_suspend_finish(unsigned long val) { +#if defined(CONFIG_ARM_PSCI_FW) if (psci_ops.cpu_suspend) { return psci_ops.cpu_suspend(MX6Q_SUSPEND_PARAM, __pa(cpu_resume)); } +#endif if (!imx6_suspend_in_ocram_fn) { cpu_do_idle(); @@ -1086,11 +1088,13 @@ static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata) return -EINVAL; } +#if defined(CONFIG_ARM_PSCI_FW) if (psci_ops.cpu_suspend) { /* TODO: seems not needed */ /* of_node_put(node); */ return ret; } +#endif /* * 16KB is allocated for IRAM TLB, but only up 8k is for kernel TLB, |