diff mbox series

[1/2] clk: qcom: gdsc: Don't override existing gdsc pd functions

Message ID 20181126172032.11567-2-jcrouse@codeaurora.org (mailing list archive)
State Accepted, archived
Headers show
Series clk: qcom: Support special behavior for SDM845 gpucc | expand

Commit Message

Jordan Crouse Nov. 26, 2018, 5:20 p.m. UTC 
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>
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
---
 drivers/clk/qcom/gdsc.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Stephen Boyd Nov. 28, 2018, 12:54 a.m. UTC | #1 
Quoting Jordan Crouse (2018-11-26 09:20:31)
> 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>
> Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
> ---

Applied to clk-next
diff mbox series

Patch

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;