From: Sarangdhar Joshi <spjoshi@codeaurora.org>
To: Ohad Ben-Cohen <ohad@wizery.com>,
Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-msm@vger.kernel.org,
Stephen Boyd <sboyd@codeaurora.org>,
Trilok Soni <tsoni@codeaurora.org>
Subject: Re: [PATCH v2 1/1] remoteproc: Add support for xo clock
Date: Tue, 25 Oct 2016 14:03:03 -0700 [thread overview]
Message-ID: <9aafecb2-0e0a-91bd-3fad-652cc7ba5fdc@codeaurora.org> (raw)
In-Reply-To: <1477429046-26855-1-git-send-email-spjoshi@codeaurora.org>
On 10/25/2016 01:57 PM, Sarangdhar Joshi wrote:
> Add xo clock support required to boot up Qualcomm ADSP processor.
> The ADSP remoteproc driver keeps xo clock enabled until the
> driver receives "handover" irq, in order to allow ADSP processor
> to vote for xo clock with rpm.
>
> Signed-off-by: Sarangdhar Joshi <spjoshi@codeaurora.org>
> ---
Changes since v1:
- Avoid logging error for probe deferral case (Stephen)
- Update commit text (Stephen)
> drivers/remoteproc/qcom_adsp_pil.c | 30 +++++++++++++++++++++++++++++-
> 1 file changed, 29 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/remoteproc/qcom_adsp_pil.c b/drivers/remoteproc/qcom_adsp_pil.c
> index 9141633..5bb25d1 100644
> --- a/drivers/remoteproc/qcom_adsp_pil.c
> +++ b/drivers/remoteproc/qcom_adsp_pil.c
> @@ -15,6 +15,7 @@
> * GNU General Public License for more details.
> */
>
> +#include <linux/clk.h>
> #include <linux/firmware.h>
> #include <linux/interrupt.h>
> #include <linux/kernel.h>
> @@ -48,6 +49,8 @@ struct qcom_adsp {
> struct qcom_smem_state *state;
> unsigned stop_bit;
>
> + struct clk *xo;
> +
> struct regulator *cx_supply;
>
> struct completion start_done;
> @@ -102,10 +105,14 @@ static int adsp_start(struct rproc *rproc)
> struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
> int ret;
>
> - ret = regulator_enable(adsp->cx_supply);
> + ret = clk_prepare_enable(adsp->xo);
> if (ret)
> return ret;
>
> + ret = regulator_enable(adsp->cx_supply);
> + if (ret)
> + goto disable_clocks;
> +
> ret = qcom_scm_pas_auth_and_reset(ADSP_PAS_ID);
> if (ret) {
> dev_err(adsp->dev,
> @@ -126,6 +133,8 @@ static int adsp_start(struct rproc *rproc)
>
> disable_regulators:
> regulator_disable(adsp->cx_supply);
> +disable_clocks:
> + clk_disable_unprepare(adsp->xo);
>
> return ret;
> }
> @@ -223,6 +232,21 @@ static irqreturn_t adsp_stop_ack_interrupt(int irq, void *dev)
> return IRQ_HANDLED;
> }
>
> +static int adsp_init_clock(struct qcom_adsp *adsp)
> +{
> + int ret;
> +
> + adsp->xo = devm_clk_get(adsp->dev, "xo");
> + if (IS_ERR(adsp->xo)) {
> + ret = PTR_ERR(adsp->xo);
> + if (ret != -EPROBE_DEFER)
> + dev_err(adsp->dev, "failed to get xo clock");
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> static int adsp_init_regulator(struct qcom_adsp *adsp)
> {
> adsp->cx_supply = devm_regulator_get(adsp->dev, "cx");
> @@ -320,6 +344,10 @@ static int adsp_probe(struct platform_device *pdev)
> if (ret)
> goto free_rproc;
>
> + ret = adsp_init_clock(adsp);
> + if (ret)
> + goto free_rproc;
> +
> ret = adsp_init_regulator(adsp);
> if (ret)
> goto free_rproc;
>
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2016-10-25 21:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-25 20:57 [PATCH v2 1/1] remoteproc: Add support for xo clock Sarangdhar Joshi
2016-10-25 21:03 ` Sarangdhar Joshi [this message]
2016-11-01 0:05 ` Bjorn Andersson
2016-11-01 17:41 ` Stephen Boyd
2016-11-01 17:46 ` Bjorn Andersson
2016-11-01 17:52 ` Stephen Boyd
2016-11-02 18:58 ` Sarangdhar Joshi
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=9aafecb2-0e0a-91bd-3fad-652cc7ba5fdc@codeaurora.org \
--to=spjoshi@codeaurora.org \
--cc=bjorn.andersson@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=ohad@wizery.com \
--cc=sboyd@codeaurora.org \
--cc=tsoni@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;
as well as URLs for NNTP newsgroup(s).