diff options
| author | Doug Anderson <dianders@chromium.org> | 2015-05-20 22:34:08 +0200 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2015-07-06 00:46:59 +0200 |
| commit | 33939403112791866da6b64875385fa1b7d9865a (patch) | |
| tree | 4dbadaf97c6b6f3c438595d7c87263fa582e62e1 /arch/arm/mach-rockchip | |
| parent | Linux 4.2-rc1 (diff) | |
| download | linux-33939403112791866da6b64875385fa1b7d9865a.tar.xz linux-33939403112791866da6b64875385fa1b7d9865a.zip | |
ARM: rockchip: restore dapswjdp after suspend
In the commit (0ea001d ARM: rockchip: disable dapswjdp during suspend)
we made the assumption that we didn't need to restore dapswjdp after
suspend because "the MASKROM will enable it back".
It turns out that's not a safe assumption. In some cases (pending
interrupts) it's possible that the WFI might act as a no-op and the
MaskROM will never run. Since we're changing the bit, we should
restore it ourselves.
Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'arch/arm/mach-rockchip')
| -rw-r--r-- | arch/arm/mach-rockchip/pm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/pm.c b/arch/arm/mach-rockchip/pm.c index b0dcbe28f78c..a7be4657af70 100644 --- a/arch/arm/mach-rockchip/pm.c +++ b/arch/arm/mach-rockchip/pm.c @@ -48,6 +48,7 @@ static struct regmap *sgrf_regmap; static u32 rk3288_pmu_pwr_mode_con; static u32 rk3288_sgrf_soc_con0; +static u32 rk3288_sgrf_cpu_con0; static inline u32 rk3288_l2_config(void) { @@ -70,6 +71,7 @@ static void rk3288_slp_mode_set(int level) { u32 mode_set, mode_set1; + regmap_read(sgrf_regmap, RK3288_SGRF_CPU_CON0, &rk3288_sgrf_cpu_con0); regmap_read(sgrf_regmap, RK3288_SGRF_SOC_CON0, &rk3288_sgrf_soc_con0); regmap_read(pmu_regmap, RK3288_PMU_PWRMODE_CON, @@ -129,6 +131,9 @@ static void rk3288_slp_mode_set(int level) static void rk3288_slp_mode_set_resume(void) { + regmap_write(sgrf_regmap, RK3288_SGRF_CPU_CON0, + rk3288_sgrf_cpu_con0 | SGRF_DAPDEVICEEN_WRITE); + regmap_write(pmu_regmap, RK3288_PMU_PWRMODE_CON, rk3288_pmu_pwr_mode_con); |