public inbox for linux-clk@vger.kernel.org
 help / color / mirror / Atom feed
From: Jordan Crouse <jcrouse@codeaurora.org>
To: sboyd@kernel.org, mturquette@baylibre.com
Cc: andy.gross@linaro.org, david.brown@linaro.org,
	rnayak@codeaurora.org, okukatla@codeaurora.org,
	tdas@codeaurora.org, linux-arm-msm@vger.kernel.orgi,
	linux-soc@vger.kernel.org, linux-clk@vger.kernel.org,
	robdclark@gmail.com, freedreno@lists.freedesktop.org
Subject: [PATCH 2/4] clk: qcom: gdsc: Don't override existing gdsc pd functions
Date: Mon, 19 Nov 2018 16:47:04 -0700	[thread overview]
Message-ID: <20181119234706.5821-3-jcrouse@codeaurora.org> (raw)
In-Reply-To: <20181119234706.5821-1-jcrouse@codeaurora.org>

In very 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.

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 b6adca1f3918..7b55368b9a9c 100644
--- a/drivers/clk/qcom/gdsc.c
+++ b/drivers/clk/qcom/gdsc.c
@@ -394,8 +394,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


  parent reply	other threads:[~2018-11-19 23:47 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-19 23:47 [RFC 0/4] msm: clk: Define a special power domain for SDM845 GX Jordan Crouse
2018-11-19 23:47 ` [PATCH 1/4] drm/msm/a6xx: Remove unwanted regulator code Jordan Crouse
2018-11-21  7:55   ` Stephen Boyd
2018-11-19 23:47 ` Jordan Crouse [this message]
2018-11-20  4:30   ` [PATCH 2/4] clk: qcom: gdsc: Don't override existing gdsc pd functions Rajendra Nayak
2018-11-19 23:47 ` [PATCH 3/4] clk: qcom: Add a dummy enable function for GX gdsc Jordan Crouse
2018-11-19 23:47 ` [PATCH 4/4] drm/msm/gpu: Attach to the GPU GX power domain Jordan Crouse
2018-11-21  7:54   ` Stephen Boyd
2018-11-21 15:00     ` Jordan Crouse
2018-11-21 19:24       ` Stephen Boyd
2018-11-21  8:00 ` [RFC 0/4] msm: clk: Define a special power domain for SDM845 GX Stephen Boyd
2018-11-21 15:04   ` Jordan Crouse

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181119234706.5821-3-jcrouse@codeaurora.org \
    --to=jcrouse@codeaurora.org \
    --cc=andy.gross@linaro.org \
    --cc=david.brown@linaro.org \
    --cc=freedreno@lists.freedesktop.org \
    --cc=linux-arm-msm@vger.kernel.orgi \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-soc@vger.kernel.org \
    --cc=mturquette@baylibre.com \
    --cc=okukatla@codeaurora.org \
    --cc=rnayak@codeaurora.org \
    --cc=robdclark@gmail.com \
    --cc=sboyd@kernel.org \
    --cc=tdas@codeaurora.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox