Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33939403 authored by Doug Anderson's avatar Doug Anderson Committed by Heiko Stuebner
Browse files

ARM: rockchip: restore dapswjdp after suspend 



In the commit (0ea001d3 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: default avatarDoug Anderson <dianders@chromium.org>
Reviewed-by: default avatarChris Zhong <zyw@rock-chips.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent d770e558

arch/arm/mach-rockchip/pm.c

+5 −0
Original line number Diff line number Diff line
@@ -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);