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

Commit 9bb91ae9 authored by Heiko Stuebner's avatar Heiko Stuebner
Browse files

ARM: rockchip: enable PMU_GPIOINT_WAKEUP_EN when entering shallow suspend 



PMU_GPIOINT_WAKEUP_EN seems needed when entering the shallow suspend
(with logic staying on) but does not seem to be needed for the deep
suspend for unknown reasons.
Testing revealed that this setting really is necessary to reliably
resume the veyron devices from suspend.

Reported-by: default avatarChris Zhong <zyw@rock-chips.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Reviewed-by: default avatarChris Zhong <zyw@rock-chips.com>
Tested-by: default avatarChris Zhong <zyw@rock-chips.com>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
parent d1d3a1a1

arch/arm/mach-rockchip/pm.c

+6 −3
Original line number Diff line number Diff line
@@ -123,9 +123,6 @@ static void rk3288_slp_mode_set(int level) 
	regmap_write(sgrf_regmap, RK3288_SGRF_FAST_BOOT_ADDR,

		     rk3288_bootram_phy);



	regmap_write(pmu_regmap, RK3288_PMU_WAKEUP_CFG1,

		     PMU_ARMINT_WAKEUP_EN);



	mode_set = BIT(PMU_GLOBAL_INT_DISABLE) | BIT(PMU_L2FLUSH_EN) |

		   BIT(PMU_SREF0_ENTER_EN) | BIT(PMU_SREF1_ENTER_EN) |

		   BIT(PMU_DDR0_GATING_EN) | BIT(PMU_DDR1_GATING_EN) |
@@ -146,6 +143,9 @@ static void rk3288_slp_mode_set(int level) 
		mode_set1 |= BIT(PMU_CLR_ALIVE) | BIT(PMU_CLR_BUS) |

			     BIT(PMU_CLR_PERI) | BIT(PMU_CLR_DMA);



		regmap_write(pmu_regmap, RK3288_PMU_WAKEUP_CFG1,

			     PMU_ARMINT_WAKEUP_EN);



		/*

		 * In deep suspend we use PMU_PMU_USE_LF to let the rk3288

		 * switch its main clock supply to the alternative 32kHz
@@ -166,6 +166,9 @@ static void rk3288_slp_mode_set(int level) 
		 */

		mode_set |= BIT(PMU_CLK_CORE_SRC_GATE_EN);



		regmap_write(pmu_regmap, RK3288_PMU_WAKEUP_CFG1,

			     PMU_ARMINT_WAKEUP_EN | PMU_GPIOINT_WAKEUP_EN);



		/* 30ms on a 24MHz clock for pmic stabilization */

		regmap_write(pmu_regmap, RK3288_PMU_STABL_CNT, 24000 * 30);

arch/arm/mach-rockchip/pm.h

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ static inline void rockchip_suspend_init(void) 


/* PMU_WAKEUP_CFG1 bits */

#define PMU_ARMINT_WAKEUP_EN		BIT(0)

#define PMU_GPIOINT_WAKEUP_EN		BIT(3)



enum rk3288_pwr_mode_con {

	PMU_PWR_MODE_EN = 0,