From: Caesar Wang <wxt@rock-chips.com>
Date: Mon, 8 Aug 2016 23:53:41 +0000 (+0800)
Subject: rockchip: fix the reset-hold release for rk3399 resume
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=78f7017cdd2290c6fded1d5d00e700424ada9cc1;p=project%2Fbcm63xx%2Fatf.git

rockchip: fix the reset-hold release for rk3399 resume

The pmusgrf reset-hold bits needs to be released, since the
pmusgrf reset-hold bits needs to be held.

Change-Id: Ia1eccc8fba18294f26b4cc07d47bc5e513dd9a1f
---

diff --git a/plat/rockchip/rk3399/drivers/pmu/pmu.c b/plat/rockchip/rk3399/drivers/pmu/pmu.c
index 00596774..01f84e92 100644
--- a/plat/rockchip/rk3399/drivers/pmu/pmu.c
+++ b/plat/rockchip/rk3399/drivers/pmu/pmu.c
@@ -899,8 +899,6 @@ static int sys_pwr_domain_resume(void)
 	enable_dvfs_plls();
 	plls_resume_finish();
 
-	pmu_sgrf_rst_hld();
-
 	sys_slp_unconfig();
 
 	mmio_write_32(SGRF_BASE + SGRF_SOC_CON0_1(1),
@@ -937,6 +935,7 @@ static int sys_pwr_domain_resume(void)
 		}
 	}
 
+	pmu_sgrf_rst_hld_release();
 	pmu_scu_b_pwrup();
 
 	pmu_power_domains_resume();