From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
Cc: sboyd@kernel.org, david.brown@linaro.org,
jassisinghbrar@gmail.com, mark.rutland@arm.com,
mturquette@baylibre.com, robh+dt@kernel.org, will.deacon@arm.com,
arnd@arndb.de, horms+renesas@verge.net.au, heiko@sntech.de,
sibis@codeaurora.org, enric.balletbo@collabora.com,
jagan@amarulasolutions.com, olof@lixom.net, vkoul@kernel.org,
niklas.cassel@linaro.org, georgi.djakov@linaro.org,
amit.kucheria@linaro.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org,
linux-arm-msm@vger.kernel.org, khasim.mohammed@linaro.org
Subject: Re: [PATCH v3 05/14] clk: qcom: apcs-msm8916: get parent clock names from DT
Date: Thu, 11 Jul 2019 07:58:38 -0700 [thread overview]
Message-ID: <20190711145838.GF7234@tuxbook-pro> (raw)
In-Reply-To: <20190625164733.11091-6-jorge.ramirez-ortiz@linaro.org>
On Tue 25 Jun 09:47 PDT 2019, Jorge Ramirez-Ortiz wrote:
> Allow accessing the parent clock names required for the driver
> operation by using the device tree node.
>
> This permits extending the driver to other platforms without having to
> modify its source code.
>
> For backwards compatibility leave previous values as default.
>
> Co-developed-by: Niklas Cassel <niklas.cassel@linaro.org>
> Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org>
> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
> drivers/clk/qcom/apcs-msm8916.c | 23 ++++++++++++++++++++---
> 1 file changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/clk/qcom/apcs-msm8916.c b/drivers/clk/qcom/apcs-msm8916.c
> index a6c89a310b18..dd82eb1e5202 100644
> --- a/drivers/clk/qcom/apcs-msm8916.c
> +++ b/drivers/clk/qcom/apcs-msm8916.c
> @@ -19,7 +19,7 @@
>
> static const u32 gpll0_a53cc_map[] = { 4, 5 };
>
> -static const char * const gpll0_a53cc[] = {
> +static const char *gpll0_a53cc[] = {
> "gpll0_vote",
> "a53pll",
> };
> @@ -50,6 +50,8 @@ static int qcom_apcs_msm8916_clk_probe(struct platform_device *pdev)
> struct regmap *regmap;
> struct clk_init_data init = { };
> int ret = -ENODEV;
> + const char *parents[2];
> + int pll_index = 0;
>
> regmap = dev_get_regmap(parent, NULL);
> if (!regmap) {
> @@ -61,6 +63,16 @@ static int qcom_apcs_msm8916_clk_probe(struct platform_device *pdev)
> if (!a53cc)
> return -ENOMEM;
>
> + /* legacy bindings only defined the pll parent clock (index = 0) with no
> + * name; when both of the parents are specified in the bindings, the
> + * pll is the second one (index = 1).
> + */
> + if (of_clk_parent_fill(parent->of_node, parents, 2) == 2) {
> + gpll0_a53cc[0] = parents[0];
> + gpll0_a53cc[1] = parents[1];
> + pll_index = 1;
> + }
> +
> init.name = "a53mux";
> init.parent_names = gpll0_a53cc;
> init.num_parents = ARRAY_SIZE(gpll0_a53cc);
> @@ -76,10 +88,11 @@ static int qcom_apcs_msm8916_clk_probe(struct platform_device *pdev)
> a53cc->src_shift = 8;
> a53cc->parent_map = gpll0_a53cc_map;
>
> - a53cc->pclk = devm_clk_get(parent, NULL);
> + a53cc->pclk = of_clk_get(parent->of_node, pll_index);
> if (IS_ERR(a53cc->pclk)) {
> ret = PTR_ERR(a53cc->pclk);
> - dev_err(dev, "failed to get clk: %d\n", ret);
> + if (ret != -EPROBE_DEFER)
> + dev_err(dev, "failed to get clk: %d\n", ret);
> return ret;
> }
>
> @@ -87,6 +100,7 @@ static int qcom_apcs_msm8916_clk_probe(struct platform_device *pdev)
> ret = clk_notifier_register(a53cc->pclk, &a53cc->clk_nb);
> if (ret) {
> dev_err(dev, "failed to register clock notifier: %d\n", ret);
> + clk_put(a53cc->pclk);
> return ret;
> }
>
> @@ -109,6 +123,8 @@ static int qcom_apcs_msm8916_clk_probe(struct platform_device *pdev)
>
> err:
> clk_notifier_unregister(a53cc->pclk, &a53cc->clk_nb);
> + clk_put(a53cc->pclk);
> +
> return ret;
> }
>
> @@ -117,6 +133,7 @@ static int qcom_apcs_msm8916_clk_remove(struct platform_device *pdev)
> struct clk_regmap_mux_div *a53cc = platform_get_drvdata(pdev);
>
> clk_notifier_unregister(a53cc->pclk, &a53cc->clk_nb);
> + clk_put(a53cc->pclk);
>
> return 0;
> }
> --
> 2.21.0
>
next prev parent reply other threads:[~2019-07-11 14:57 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-25 16:47 [PATCH v3 00/14] Support CPU frequency scaling on QCS404 Jorge Ramirez-Ortiz
2019-06-25 16:47 ` [PATCH v3 01/14] clk: qcom: gcc: limit GPLL0_AO_OUT operating frequency Jorge Ramirez-Ortiz
2019-07-11 15:30 ` Bjorn Andersson
2019-06-25 16:47 ` [PATCH v3 02/14] mbox: qcom: add APCS child device for QCS404 Jorge Ramirez-Ortiz
2019-07-11 14:44 ` Bjorn Andersson
2019-07-31 14:10 ` Jorge Ramirez
2019-06-25 16:47 ` [PATCH v3 03/14] mbox: qcom: replace integer with valid macro Jorge Ramirez-Ortiz
2019-07-11 14:37 ` Bjorn Andersson
2019-06-25 16:47 ` [PATCH v3 04/14] dt-bindings: mailbox: qcom: Add clock-name optional property Jorge Ramirez-Ortiz
2019-07-11 14:45 ` Bjorn Andersson
2019-06-25 16:47 ` [PATCH v3 05/14] clk: qcom: apcs-msm8916: get parent clock names from DT Jorge Ramirez-Ortiz
2019-07-11 14:58 ` Bjorn Andersson [this message]
2019-06-25 16:47 ` [PATCH v3 06/14] clk: qcom: hfpll: " Jorge Ramirez-Ortiz
2019-07-11 15:07 ` Bjorn Andersson
2019-06-25 16:47 ` [PATCH v3 07/14] clk: qcom: hfpll: register as clock provider Jorge Ramirez-Ortiz
2019-07-11 15:07 ` Bjorn Andersson
2019-06-25 16:47 ` [PATCH v3 08/14] clk: qcom: hfpll: CLK_IGNORE_UNUSED Jorge Ramirez-Ortiz
2019-07-11 15:16 ` Bjorn Andersson
2019-07-31 14:30 ` Jorge Ramirez
2019-06-25 16:47 ` [PATCH v3 09/14] arm64: dts: qcom: msm8916: Add the clocks for the APCS mux/divider Jorge Ramirez-Ortiz
2019-07-11 15:24 ` Bjorn Andersson
2019-06-25 16:47 ` [PATCH v3 10/14] arm64: dts: qcom: qcs404: Add OPP table Jorge Ramirez-Ortiz
2019-07-11 15:25 ` Bjorn Andersson
2019-06-25 16:47 ` [PATCH v3 11/14] arm64: dts: qcom: qcs404: Add HFPLL node Jorge Ramirez-Ortiz
2019-07-11 15:25 ` Bjorn Andersson
2019-06-25 16:47 ` [PATCH v3 12/14] arm64: dts: qcom: qcs404: Add the clocks for APCS mux/divider Jorge Ramirez-Ortiz
2019-07-11 15:27 ` Bjorn Andersson
2019-06-25 16:47 ` [PATCH v3 13/14] arm64: dts: qcom: qcs404: Add DVFS support Jorge Ramirez-Ortiz
2019-06-26 9:08 ` Niklas Cassel
2019-06-26 9:10 ` Niklas Cassel
2019-07-11 15:29 ` Bjorn Andersson
2019-06-25 16:47 ` [PATCH v3 14/14] arm64: defconfig: Enable HFPLL Jorge Ramirez-Ortiz
2019-07-11 15:27 ` 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=20190711145838.GF7234@tuxbook-pro \
--to=bjorn.andersson@linaro.org \
--cc=amit.kucheria@linaro.org \
--cc=arnd@arndb.de \
--cc=david.brown@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=enric.balletbo@collabora.com \
--cc=georgi.djakov@linaro.org \
--cc=heiko@sntech.de \
--cc=horms+renesas@verge.net.au \
--cc=jagan@amarulasolutions.com \
--cc=jassisinghbrar@gmail.com \
--cc=jorge.ramirez-ortiz@linaro.org \
--cc=khasim.mohammed@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mturquette@baylibre.com \
--cc=niklas.cassel@linaro.org \
--cc=olof@lixom.net \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=sibis@codeaurora.org \
--cc=vkoul@kernel.org \
--cc=will.deacon@arm.com \
/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).