1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
index 961d4ee86b75..e8b5a6bfcc8a 100644
--- a/drivers/clk/rockchip/clk-rk3288.c
+++ b/drivers/clk/rockchip/clk-rk3288.c
@@ -861,6 +861,9 @@ static const int rk3288_saved_cru_reg_ids[] = {
         RK3288_CLKSEL_CON(10),
         RK3288_CLKSEL_CON(33),
         RK3288_CLKSEL_CON(37),
+
+        /* We turn aclk_dmac1 on for suspend; this will restore it */
+        RK3288_CLKGATE_CON(10),
 };
 
 static u32 rk3288_saved_cru_regs[ARRAY_SIZE(rk3288_saved_cru_reg_ids)];
@@ -877,6 +880,14 @@ static int rk3288_clk_suspend(void)
         }
 
         /*
+         * Going into deep sleep (specifically setting PMU_CLR_DMA in
+         * RK3288_PMU_PWRMODE_CON1) appears to fail unless
+         * "aclk_dmac1" is on.
+         */
+        writel_relaxed(1 << (12 + 16),
+                       rk3288_cru_base + RK3288_CLKGATE_CON(10));
+
+        /*
          * Switch PLLs other than DPLL (for SDRAM) to slow mode to
          * avoid crashes on resume. The Mask ROM on the system will
          * put APLL, CPLL, and GPLL into slow mode at resume time