diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-12-11 16:43:07 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-12-24 01:27:42 +0100 |
| commit | e20bc8ad68135cf038ce8441c6b7f50c286b62c4 (patch) | |
| tree | 2e7e3902faff4888f06d865f75a42e7bee0fe518 | |
| parent | c96eff88147516a14543cca355112e16cedb2480 (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>
| -rw-r--r-- | arch/arm/mach-imx/cpuidle-imx6ul.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/pm-imx6.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/cpuidle-imx6ul.c b/arch/arm/mach-imx/cpuidle-imx6ul.c index 4f22b8f0d02b..f45ca55f984d 100644 --- a/arch/arm/mach-imx/cpuidle-imx6ul.c +++ b/arch/arm/mach-imx/cpuidle-imx6ul.c @@ -93,10 +93,12 @@ static void (*imx6ul_wfi_in_iram_fn)(void __iomem *iram_vbase); static int imx6ul_idle_finish(unsigned long val) { +#if defined(CONFIG_ARM_PSCI_FW) if (psci_ops.cpu_suspend) psci_ops.cpu_suspend(MX6UL_POWERDWN_IDLE_PARAM, __pa(cpu_resume)); else +#endif imx6ul_wfi_in_iram_fn(wfi_iram_base); return 0; diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c index 5e102e736afa..3a32e7fbd729 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, |