| Message ID | 20181126165416.32519-2-jcrouse@codeaurora.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | clk: qcom: | expand |
On Mon 26 Nov 08:54 PST 2018, Jordan Crouse wrote: > In extreme cases an individual gdsc may wish to override the > power domain enable or disable callback functions for their own > purposes. Only set the generic gdsc callback if the function pointers > are not already set. > > Acked-by: Rajendra Nayak <rnayak@codeaurora.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org> > --- > drivers/clk/qcom/gdsc.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c > index a077133c7ce3..dd63aa36b092 100644 > --- a/drivers/clk/qcom/gdsc.c > +++ b/drivers/clk/qcom/gdsc.c > @@ -350,8 +350,10 @@ static int gdsc_init(struct gdsc *sc) > else > gdsc_clear_mem_on(sc); > > - sc->pd.power_off = gdsc_disable; > - sc->pd.power_on = gdsc_enable; > + if (!sc->pd.power_off) > + sc->pd.power_off = gdsc_disable; > + if (!sc->pd.power_on) > + sc->pd.power_on = gdsc_enable; > pm_genpd_init(&sc->pd, NULL, !on); > > return 0; > -- > 2.18.0 >
diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c index a077133c7ce3..dd63aa36b092 100644 --- a/drivers/clk/qcom/gdsc.c +++ b/drivers/clk/qcom/gdsc.c @@ -350,8 +350,10 @@ static int gdsc_init(struct gdsc *sc) else gdsc_clear_mem_on(sc); - sc->pd.power_off = gdsc_disable; - sc->pd.power_on = gdsc_enable; + if (!sc->pd.power_off) + sc->pd.power_off = gdsc_disable; + if (!sc->pd.power_on) + sc->pd.power_on = gdsc_enable; pm_genpd_init(&sc->pd, NULL, !on); return 0;