From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Sarangdhar Joshi <spjoshi@codeaurora.org>
Cc: Andy Gross <andy.gross@linaro.org>,
David Brown <david.brown@linaro.org>,
linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org,
linux-kernel@vger.kernel.org,
Jordan Crouse <jcrouse@codeaurora.org>,
Stephen Boyd <sboyd@codeaurora.org>,
Trilok Soni <tsoni@codeaurora.org>
Subject: Re: [PATCH v3 2/3] firmware: qcom: scm: Remove core, iface and bus clocks dependency
Date: Fri, 18 Nov 2016 11:59:17 -0800 [thread overview]
Message-ID: <20161118195917.GN28340@tuxbot> (raw)
In-Reply-To: <1479259165-1601-3-git-send-email-spjoshi@codeaurora.org>
On Tue 15 Nov 17:19 PST 2016, Sarangdhar Joshi wrote:
> Core, iface and bus clocks are not required to be voted from SCM
> driver for some of the Qualcomm chipsets. Remove dependency on
> these clocks from driver.
>
> Suggested-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> Signed-off-by: Sarangdhar Joshi <spjoshi@codeaurora.org>
> ---
> drivers/firmware/qcom_scm.c | 49 ++++++++++++++++++++++++++++++++++-----------
> 1 file changed, 37 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
> index d79fecd..ddf7c8b 100644
> --- a/drivers/firmware/qcom_scm.c
> +++ b/drivers/firmware/qcom_scm.c
> @@ -28,6 +28,10 @@
>
> #include "qcom_scm.h"
>
> +#define SCM_HAS_CORE_CLK BIT(0)
> +#define SCM_HAS_IFACE_CLK BIT(1)
> +#define SCM_HAS_BUS_CLK BIT(2)
> +
> struct qcom_scm {
> struct device *dev;
> struct clk *core_clk;
> @@ -380,32 +384,40 @@ EXPORT_SYMBOL(qcom_scm_is_available);
> static int qcom_scm_probe(struct platform_device *pdev)
> {
> struct qcom_scm *scm;
> + unsigned long clks;
> int ret;
>
> scm = devm_kzalloc(&pdev->dev, sizeof(*scm), GFP_KERNEL);
> if (!scm)
> return -ENOMEM;
>
> - scm->core_clk = devm_clk_get(&pdev->dev, "core");
> - if (IS_ERR(scm->core_clk)) {
> - if (PTR_ERR(scm->core_clk) == -EPROBE_DEFER)
> - return PTR_ERR(scm->core_clk);
> + clks = (unsigned long)of_device_get_match_data(&pdev->dev);
> + if (clks & SCM_HAS_CORE_CLK) {
> + scm->core_clk = devm_clk_get(&pdev->dev, "core");
> + if (IS_ERR(scm->core_clk)) {
> + if (PTR_ERR(scm->core_clk) == -EPROBE_DEFER)
> + return PTR_ERR(scm->core_clk);
>
> - scm->core_clk = NULL;
> + scm->core_clk = NULL;
> + }
> }
>
> - if (of_device_is_compatible(pdev->dev.of_node, "qcom,scm")) {
> + if (clks & SCM_HAS_IFACE_CLK) {
> scm->iface_clk = devm_clk_get(&pdev->dev, "iface");
> if (IS_ERR(scm->iface_clk)) {
> if (PTR_ERR(scm->iface_clk) != -EPROBE_DEFER)
> - dev_err(&pdev->dev, "failed to acquire iface clk\n");
> + dev_err(&pdev->dev,
> + "failed to acquire iface clk\n");
> return PTR_ERR(scm->iface_clk);
> }
> + }
>
> + if (clks & SCM_HAS_BUS_CLK) {
> scm->bus_clk = devm_clk_get(&pdev->dev, "bus");
> if (IS_ERR(scm->bus_clk)) {
> if (PTR_ERR(scm->bus_clk) != -EPROBE_DEFER)
> - dev_err(&pdev->dev, "failed to acquire bus clk\n");
> + dev_err(&pdev->dev,
> + "failed to acquire bus clk\n");
> return PTR_ERR(scm->bus_clk);
> }
> }
> @@ -429,10 +441,23 @@ static int qcom_scm_probe(struct platform_device *pdev)
> }
>
> static const struct of_device_id qcom_scm_dt_match[] = {
> - { .compatible = "qcom,scm-apq8064",},
> - { .compatible = "qcom,scm-msm8660",},
> - { .compatible = "qcom,scm-msm8960",},
> - { .compatible = "qcom,scm",},
> + { .compatible = "qcom,scm-apq8064",
> + .data = (void *) SCM_HAS_CORE_CLK,
> + },
> + { .compatible = "qcom,scm-msm8660",
> + .data = (void *) SCM_HAS_CORE_CLK,
> + },
> + { .compatible = "qcom,scm-msm8960",
> + .data = (void *) SCM_HAS_CORE_CLK,
> + },
> + { .compatible = "qcom,scm-msm8996",
> + .data = NULL, /* no clocks */
> + },
> + { .compatible = "qcom,scm",
> + .data = (void *)(SCM_HAS_CORE_CLK
> + | SCM_HAS_IFACE_CLK
> + | SCM_HAS_BUS_CLK),
> + },
> {}
> };
>
> --
> 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-11-18 19:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-16 1:19 [PATCH v3 0/3] Remove clocks dependency from SCM driver Sarangdhar Joshi
2016-11-16 1:19 ` [PATCH v3 1/3] dt-bindings: firmware: scm: Add MSM8996 DT bindings Sarangdhar Joshi
2016-11-17 23:12 ` Stephen Boyd
2016-11-18 19:55 ` Bjorn Andersson
2016-11-16 1:19 ` [PATCH v3 2/3] firmware: qcom: scm: Remove core, iface and bus clocks dependency Sarangdhar Joshi
2016-11-17 23:12 ` Stephen Boyd
2016-11-18 19:59 ` Bjorn Andersson [this message]
2016-11-16 1:19 ` [PATCH v3 3/3] firmware: qcom: scm: Return PTR_ERR when devm_clk_get fails Sarangdhar Joshi
2016-11-17 23:13 ` Stephen Boyd
2016-11-18 19:59 ` Bjorn Andersson
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=20161118195917.GN28340@tuxbot \
--to=bjorn.andersson@linaro.org \
--cc=andy.gross@linaro.org \
--cc=david.brown@linaro.org \
--cc=jcrouse@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-soc@vger.kernel.org \
--cc=sboyd@codeaurora.org \
--cc=spjoshi@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).