summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavidcunado-arm <david.cunado@arm.com>2016-09-13 17:13:45 +0100
committerGitHub <noreply@github.com>2016-09-13 17:13:45 +0100
commitb1887a86aae9d52d5333251d6056478c470b59f0 (patch)
tree68d212e885ebe6df87e4feddd1527807a5f354e3
parent4531d3c9ab409fc5df2d865620587a12f9fe7f3c (diff)
parent0587788abcd4daf98a8bef1f9545a9841e1015a8 (diff)
Merge pull request #703 from rockchip-linux/fixes-gic-panic
rockchip: fixes the gic panic for rk3399 resume
-rwxr-xr-xplat/rockchip/rk3399/drivers/pmu/pmu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/plat/rockchip/rk3399/drivers/pmu/pmu.c b/plat/rockchip/rk3399/drivers/pmu/pmu.c
index 609a30d1..07a5b1e7 100755
--- a/plat/rockchip/rk3399/drivers/pmu/pmu.c
+++ b/plat/rockchip/rk3399/drivers/pmu/pmu.c
@@ -1189,6 +1189,9 @@ static int sys_pwr_domain_resume(void)
BIT(PMU_CLR_PERILP) |
BIT(PMU_CLR_PMU) |
BIT(PMU_CLR_GIC));
+
+ plat_rockchip_gic_cpuif_enable();
+
return 0;
}