diff mbox series

[3/5] clk: qcom: hfpll: get parent clock names from DT

Message ID 20190826164510.6425-3-jorge.ramirez-ortiz@linaro.org
State New
Headers show
Series [1/5] clk: qcom: gcc: limit GPLL0_AO_OUT operating frequency | expand

Commit Message

Jorge Ramirez-Ortiz Aug. 26, 2019, 4:45 p.m. UTC 
Allow accessing the parent clock name required for the driver
operation using the device tree node.

This permits extending the driver to other platforms without having to
modify its source code.

For backwards compatibility leave the previous value 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/hfpll.c | 8 ++++++++
 1 file changed, 8 insertions(+)

-- 
2.22.0

Comments

Stephen Boyd Sept. 9, 2019, 10:22 a.m. UTC | #1 
Quoting Jorge Ramirez-Ortiz (2019-08-26 09:45:08)
> diff --git a/drivers/clk/qcom/hfpll.c b/drivers/clk/qcom/hfpll.c

> index a6de7101430c..87b7f46d27e0 100644

> --- a/drivers/clk/qcom/hfpll.c

> +++ b/drivers/clk/qcom/hfpll.c

> @@ -52,6 +52,7 @@ static int qcom_hfpll_probe(struct platform_device *pdev)

>         void __iomem *base;

>         struct regmap *regmap;

>         struct clk_hfpll *h;

> +       struct clk *pclk;

>         struct clk_init_data init = {

>                 .parent_names = (const char *[]){ "xo" },

>                 .num_parents = 1,

> @@ -75,6 +76,13 @@ static int qcom_hfpll_probe(struct platform_device *pdev)

>                                           0, &init.name))

>                 return -ENODEV;

>  

> +       /* get parent clock from device tree (optional) */

> +       pclk = devm_clk_get(dev, "xo");

> +       if (!IS_ERR(pclk))

> +               init.parent_names = (const char *[]){ __clk_get_name(pclk) };

> +       else if (PTR_ERR(pclk) == -EPROBE_DEFER)

> +               return -EPROBE_DEFER;

> +


Can this use the "new" way of specifying parents of clks? That would be
better than calling clk_get() on the XO clk to handle this.

>         h->d = &hdata;

>         h->clkr.hw.init = &init;

>         spin_lock_init(&h->lock);
diff mbox series

Patch

diff --git a/drivers/clk/qcom/hfpll.c b/drivers/clk/qcom/hfpll.c
index a6de7101430c..87b7f46d27e0 100644
--- a/drivers/clk/qcom/hfpll.c
+++ b/drivers/clk/qcom/hfpll.c
@@ -52,6 +52,7 @@  static int qcom_hfpll_probe(struct platform_device *pdev)
 	void __iomem *base;
 	struct regmap *regmap;
 	struct clk_hfpll *h;
+	struct clk *pclk;
 	struct clk_init_data init = {
 		.parent_names = (const char *[]){ "xo" },
 		.num_parents = 1,
@@ -75,6 +76,13 @@  static int qcom_hfpll_probe(struct platform_device *pdev)
 					  0, &init.name))
 		return -ENODEV;
 
+	/* get parent clock from device tree (optional) */
+	pclk = devm_clk_get(dev, "xo");
+	if (!IS_ERR(pclk))
+		init.parent_names = (const char *[]){ __clk_get_name(pclk) };
+	else if (PTR_ERR(pclk) == -EPROBE_DEFER)
+		return -EPROBE_DEFER;
+
 	h->d = &hdata;
 	h->clkr.hw.init = &init;
 	spin_lock_init(&h->lock);