diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2018-02-01 08:58:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-01 08:58:23 +0000 |
| commit | 334e1ceb4812982543ce2f77a61087477915042c (patch) | |
| tree | a5fc2563be325a7741de8a36404bc4bfb7f590c9 /plat/rockchip/common | |
| parent | e45820dc54ed5df7f22fbeeef9739ac67618ebd6 (diff) | |
| parent | 3284ce15ba775432900684bca38983b7b34a33b8 (diff) | |
Merge pull request #1236 from dbasehore/gic-save-restore
RK3399 GIC save/restore
Diffstat (limited to 'plat/rockchip/common')
| -rw-r--r-- | plat/rockchip/common/plat_pm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plat/rockchip/common/plat_pm.c b/plat/rockchip/common/plat_pm.c index cd88f60c..352dbc84 100644 --- a/plat/rockchip/common/plat_pm.c +++ b/plat/rockchip/common/plat_pm.c @@ -246,14 +246,14 @@ void rockchip_pwr_domain_suspend(const psci_power_state_t *target_state) if (RK_CORE_PWR_STATE(target_state) != PLAT_MAX_OFF_STATE) return; + /* Prevent interrupts from spuriously waking up this cpu */ + plat_rockchip_gic_cpuif_disable(); + if (RK_SYSTEM_PWR_STATE(target_state) == PLAT_MAX_OFF_STATE) rockchip_soc_sys_pwr_dm_suspend(); else rockchip_soc_cores_pwr_dm_suspend(); - /* Prevent interrupts from spuriously waking up this cpu */ - plat_rockchip_gic_cpuif_disable(); - /* Perform the common cluster specific operations */ if (RK_CLUSTER_PWR_STATE(target_state) == PLAT_MAX_OFF_STATE) plat_cci_disable(); |