Merge branch 'clk-qcom-sdm845' into clk-next

[sfrench/cifs-2.6.git] / drivers / clk / qcom / gdsc.c

diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c
index 4696e241db89ff3610f15b1e21c8305652f9b1ed..a077133c7ce38328b5c8bebf5f8e6ad3c6b7f166 100644 (file)
--- a/drivers/clk/qcom/gdsc.c
+++ b/drivers/clk/qcom/gdsc.c
@@ -337,6 +337,14 @@ static int gdsc_init(struct gdsc *sc)
        if ((sc->flags & VOTABLE) && on)
                gdsc_enable(&sc->pd);
 
+       /* If ALWAYS_ON GDSCs are not ON, turn them ON */
+       if (sc->flags & ALWAYS_ON) {
+               if (!on)
+                       gdsc_enable(&sc->pd);
+               on = true;
+               sc->pd.flags |= GENPD_FLAG_ALWAYS_ON;
+       }
+
        if (on || (sc->pwrsts & PWRSTS_RET))
                gdsc_force_mem_on(sc);
        else