| Message ID | 1544453.8uqOvAiDmD@diego (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/05/2015 06:51 AM, Heiko Stübner wrote: > 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: Chris Zhong <zyw@rock-chips.com> > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > arch/arm/mach-rockchip/pm.c | 9 ++++++--- > arch/arm/mach-rockchip/pm.h | 1 + > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-rockchip/pm.c b/arch/arm/mach-rockchip/pm.c > index c11a30b..156cd23 100644 > --- a/arch/arm/mach-rockchip/pm.c > +++ b/arch/arm/mach-rockchip/pm.c > @@ -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); > > diff --git a/arch/arm/mach-rockchip/pm.h b/arch/arm/mach-rockchip/pm.h > index 8a55ee2..b5af26f 100644 > --- a/arch/arm/mach-rockchip/pm.h > +++ b/arch/arm/mach-rockchip/pm.h > @@ -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, > Reviewed-by: Chris Zhong <zyw@rock-chips.com> Tested-by: Chris Zhong <zyw@rock-chips.com>
Heiko, On Tue, Aug 4, 2015 at 3:51 PM, Heiko Stübner <heiko@sntech.de> wrote: > 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: Chris Zhong <zyw@rock-chips.com> > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > arch/arm/mach-rockchip/pm.c | 9 ++++++--- > arch/arm/mach-rockchip/pm.h | 1 + > 2 files changed, 7 insertions(+), 3 deletions(-) Very odd, but OK by me... Hopefully we'll eventually end up being able to use deep suspend on mainline. That'd be nice, wouldn't it? Reviewed-by: Douglas Anderson <dianders@chromium.org>
Am Mittwoch, 5. August 2015, 18:55:52 schrieb Doug Anderson: > Heiko, > > On Tue, Aug 4, 2015 at 3:51 PM, Heiko Stübner <heiko@sntech.de> wrote: > > 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: Chris Zhong <zyw@rock-chips.com> > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > > --- > > > > arch/arm/mach-rockchip/pm.c | 9 ++++++--- > > arch/arm/mach-rockchip/pm.h | 1 + > > 2 files changed, 7 insertions(+), 3 deletions(-) > > Very odd, but OK by me... Hopefully we'll get an explaination from the ic-people soon-ish. > Hopefully we'll eventually end up being > able to use deep suspend on mainline. That'd be nice, wouldn't it? hehe ... yep, one of the big remaining projects :-)
diff --git a/arch/arm/mach-rockchip/pm.c b/arch/arm/mach-rockchip/pm.c index c11a30b..156cd23 100644 --- a/arch/arm/mach-rockchip/pm.c +++ b/arch/arm/mach-rockchip/pm.c @@ -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); diff --git a/arch/arm/mach-rockchip/pm.h b/arch/arm/mach-rockchip/pm.h index 8a55ee2..b5af26f 100644 --- a/arch/arm/mach-rockchip/pm.h +++ b/arch/arm/mach-rockchip/pm.h @@ -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,
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: Chris Zhong <zyw@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- arch/arm/mach-rockchip/pm.c | 9 ++++++--- arch/arm/mach-rockchip/pm.h | 1 + 2 files changed, 7 insertions(+), 3 deletions(-)