From: Lucas Stach <l.stach@pengutronix.de>
To: Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Shawn Guo <shawnguo@kernel.org>,
Richard Zhu <hongxing.zhu@nxp.com>
Cc: marex@denx.de, devicetree@vger.kernel.org,
richard.leitner@linux.dev, marcel.ziswiler@toradex.com,
tharvey@gateworks.com, patchwork-lst@pengutronix.de,
alexander.stein@ew.tq-group.com,
NXP Linux Team <linux-imx@nxp.com>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
lukas@mntre.com, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 4/4] soc: imx: imx8mp-blk-ctrl: expose high performance PLL clock
Date: Tue, 13 Dec 2022 17:34:44 +0100 [thread overview]
Message-ID: <ac3096c8f8c0b5b95d54d2cf93cb0f8d743c3d60.camel@pengutronix.de> (raw)
In-Reply-To: <20221213160112.1900410-4-l.stach@pengutronix.de>
Am Dienstag, dem 13.12.2022 um 17:01 +0100 schrieb Lucas Stach:
> Expose the high performance PLL as a regular Linux clock, so the
> PCIe PHY can use it when there is no external refclock provided.
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
> drivers/soc/imx/imx8mp-blk-ctrl.c | 99 +++++++++++++++++++++++++++++++
> 1 file changed, 99 insertions(+)
>
> diff --git a/drivers/soc/imx/imx8mp-blk-ctrl.c b/drivers/soc/imx/imx8mp-blk-ctrl.c
> index b3d9f6e083ba..ad5aebd640eb 100644
> --- a/drivers/soc/imx/imx8mp-blk-ctrl.c
> +++ b/drivers/soc/imx/imx8mp-blk-ctrl.c
> @@ -5,6 +5,7 @@
> */
>
> #include <linux/clk.h>
> +#include <linux/clk-provider.h>
> #include <linux/device.h>
> #include <linux/interconnect.h>
> #include <linux/module.h>
> @@ -21,6 +22,15 @@
> #define USB_CLOCK_MODULE_EN BIT(1)
> #define PCIE_PHY_APB_RST BIT(4)
> #define PCIE_PHY_INIT_RST BIT(5)
> +#define GPR_REG1 0x4
> +#define PLL_LOCK BIT(13)
> +#define GPR_REG2 0x8
> +#define P_PLL_MASK GENMASK(5, 0)
> +#define M_PLL_MASK GENMASK(15, 6)
> +#define S_PLL_MASK GENMASK(18, 16)
> +#define GPR_REG3 0xc
> +#define PLL_CKE BIT(17)
> +#define PLL_RST BIT(31)
>
> struct imx8mp_blk_ctrl_domain;
>
> @@ -74,6 +84,94 @@ to_imx8mp_blk_ctrl_domain(struct generic_pm_domain *genpd)
> return container_of(genpd, struct imx8mp_blk_ctrl_domain, genpd);
> }
>
> +struct clk_hsio_pll {
> + struct clk_hw hw;
> + struct regmap *regmap;
> +};
> +
> +static inline struct clk_hsio_pll *to_clk_hsio_pll(struct clk_hw *hw)
> +{
> + return container_of(hw, struct clk_hsio_pll, hw);
> +}
> +
> +static int clk_hsio_pll_prepare(struct clk_hw *hw)
> +{
> + struct clk_hsio_pll *clk = to_clk_hsio_pll(hw);
> + u32 val;
> +
> + /* set the PLL configuration */
> + regmap_update_bits(clk->regmap, GPR_REG2,
> + P_PLL_MASK | M_PLL_MASK | S_PLL_MASK,
> + FIELD_PREP(P_PLL_MASK, 12) |
> + FIELD_PREP(M_PLL_MASK, 800) |
> + FIELD_PREP(S_PLL_MASK, 4));
> +
> + /* de-assert PLL reset */
> + regmap_update_bits(clk->regmap, GPR_REG3, PLL_RST, PLL_RST);
> +
> + /* enable PLL */
> + regmap_update_bits(clk->regmap, GPR_REG3, PLL_CKE, PLL_CKE);
> +
> + return regmap_read_poll_timeout(clk->regmap, GPR_REG1, val,
> + val & PLL_LOCK, 10, 100);
> +}
> +
> +static void clk_hsio_pll_unprepare(struct clk_hw *hw)
> +{
> + struct clk_hsio_pll *clk = to_clk_hsio_pll(hw);
> +
> + regmap_update_bits(clk->regmap, GPR_REG3, PLL_RST | PLL_CKE, 0);
> +}
> +
> +static int clk_hsio_pll_is_prepared(struct clk_hw *hw)
> +{
> + struct clk_hsio_pll *clk = to_clk_hsio_pll(hw);
> +
> + return regmap_test_bits(clk->regmap, GPR_REG1, PLL_LOCK);
> +}
> +
> +static unsigned long clk_hsio_pll_recalc_rate(struct clk_hw *hw,
> + unsigned long parent_rate)
> +{
> + return 100000000;
> +}
> +
> +static const struct clk_ops clk_hsio_pll_ops = {
> + .prepare = clk_hsio_pll_prepare,
> + .unprepare = clk_hsio_pll_unprepare,
> + .is_prepared = clk_hsio_pll_is_prepared,
> + .recalc_rate = clk_hsio_pll_recalc_rate,
> +};
> +
> +int imx8mp_hsio_blk_ctrl_probe(struct imx8mp_blk_ctrl *bc)
> +{
> + struct clk_hsio_pll *clk_hsio_pll;
> + struct clk_hw *hw;
> + struct clk_init_data init = {};
> + int ret;
> +
> + printk("%s\n", __func__);
This printk should obviously not be here. Removed locally. I'll wait
for some feedback before sending v2.
Regards,
Lucas
> +
> + clk_hsio_pll = devm_kzalloc(bc->dev, sizeof(*clk_hsio_pll), GFP_KERNEL);
> + if (!clk_hsio_pll)
> + return -ENOMEM;
> +
> + init.name = "hsio_pll";
> + init.ops = &clk_hsio_pll_ops;
> + init.parent_names = (const char *[]){"osc_24m"};
> + init.num_parents = 1;
> +
> + clk_hsio_pll->regmap = bc->regmap;
> + clk_hsio_pll->hw.init = &init;
> +
> + hw = &clk_hsio_pll->hw;
> + ret = devm_clk_hw_register(bc->dev, hw);
> + if (ret)
> + return ret;
> +
> + return devm_of_clk_add_hw_provider(bc->dev, of_clk_hw_simple_get, hw);
> +}
> +
> static void imx8mp_hsio_blk_ctrl_power_on(struct imx8mp_blk_ctrl *bc,
> struct imx8mp_blk_ctrl_domain *domain)
> {
> @@ -188,6 +286,7 @@ static const struct imx8mp_blk_ctrl_domain_data imx8mp_hsio_domain_data[] = {
>
> static const struct imx8mp_blk_ctrl_data imx8mp_hsio_blk_ctl_dev_data = {
> .max_reg = 0x24,
> + .probe = imx8mp_hsio_blk_ctrl_probe,
> .power_on = imx8mp_hsio_blk_ctrl_power_on,
> .power_off = imx8mp_hsio_blk_ctrl_power_off,
> .power_notifier_fn = imx8mp_hsio_power_notifier,
next prev parent reply other threads:[~2022-12-13 16:34 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-13 16:01 [PATCH 1/4] dt-bindings: soc: imx8mp-hsio-blk-ctrl: add clock cells Lucas Stach
2022-12-13 16:01 ` [PATCH 2/4] arm64: dts: imx8mp: add clock-cells to hsio-blk-ctrl Lucas Stach
2022-12-13 16:01 ` [PATCH 3/4] soc: imx: imx8mp-blk-ctrl: add instance specific probe function Lucas Stach
2022-12-13 16:01 ` [PATCH 4/4] soc: imx: imx8mp-blk-ctrl: expose high performance PLL clock Lucas Stach
2022-12-13 16:34 ` Lucas Stach [this message]
2022-12-13 20:40 ` kernel test robot
2022-12-14 6:30 ` Marcel Ziswiler
2022-12-14 4:25 ` kernel test robot
2022-12-14 6:56 ` kernel test robot
2022-12-14 2:22 ` [PATCH 1/4] dt-bindings: soc: imx8mp-hsio-blk-ctrl: add clock cells Rob Herring
2022-12-14 5:41 ` Marcel Ziswiler
2022-12-14 5:51 ` Hongxing Zhu
2022-12-14 6:22 ` Marcel Ziswiler
2022-12-14 8:30 ` Hongxing Zhu
2022-12-14 6:42 ` Alexander Stein
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=ac3096c8f8c0b5b95d54d2cf93cb0f8d743c3d60.camel@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=alexander.stein@ew.tq-group.com \
--cc=devicetree@vger.kernel.org \
--cc=hongxing.zhu@nxp.com \
--cc=kernel@pengutronix.de \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=lukas@mntre.com \
--cc=marcel.ziswiler@toradex.com \
--cc=marex@denx.de \
--cc=patchwork-lst@pengutronix.de \
--cc=richard.leitner@linux.dev \
--cc=robh+dt@kernel.org \
--cc=shawnguo@kernel.org \
--cc=tharvey@gateworks.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).