| Message ID | 20190611180757.32299-3-paul@crapouillou.net (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [v2,1/5] clk: ingenic: Add missing header in cgu.h | expand |
Quoting Paul Cercueil (2019-06-11 11:07:55) > Instead of forcing the jz4740 clocks to suspend here, we let the CGU > driver handle it. > We also let the CGU driver set the "sleep mode" bit. > > This has the added benefit that now it is possible to build a kernel on > SoCs newer than the JZ4740 with CONFIG_PM. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- Applied to clk-next
diff --git a/arch/mips/jz4740/pm.c b/arch/mips/jz4740/pm.c index bbdd2b801e6e..f9b551f01f42 100644 --- a/arch/mips/jz4740/pm.c +++ b/arch/mips/jz4740/pm.c @@ -9,21 +9,13 @@ #include <linux/delay.h> #include <linux/suspend.h> -#include <asm/mach-jz4740/clock.h> - static int jz4740_pm_enter(suspend_state_t state) { - jz4740_clock_suspend(); - - jz4740_clock_set_wait_mode(JZ4740_WAIT_MODE_SLEEP); - __asm__(".set\tmips3\n\t" "wait\n\t" ".set\tmips0"); - jz4740_clock_set_wait_mode(JZ4740_WAIT_MODE_IDLE); - jz4740_clock_resume(); return 0; }
Instead of forcing the jz4740 clocks to suspend here, we let the CGU driver handle it. We also let the CGU driver set the "sleep mode" bit. This has the added benefit that now it is possible to build a kernel on SoCs newer than the JZ4740 with CONFIG_PM. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- Notes: v2: Rebase on v5.2-rc4 arch/mips/jz4740/pm.c | 8 -------- 1 file changed, 8 deletions(-)