From: <Claudiu.Beznea@microchip.com>
To: <Conor.Dooley@microchip.com>, <mturquette@baylibre.com>,
<sboyd@kernel.org>, <robh+dt@kernel.org>,
<krzysztof.kozlowski+dt@linaro.org>, <palmer@dabbelt.com>,
<Daire.McNamara@microchip.com>
Cc: <paul.walmsley@sifive.com>, <aou@eecs.berkeley.edu>,
<linux-clk@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-riscv@lists.infradead.org>
Subject: Re: [PATCH v4 07/13] clk: microchip: mpfs: add MSS pll's set & round rate
Date: Thu, 8 Sep 2022 06:46:06 +0000 [thread overview]
Message-ID: <b7304717-a14a-a677-1a5e-09477a5ac6c6@microchip.com> (raw)
In-Reply-To: <20220830125249.2373416-7-conor.dooley@microchip.com>
On 30.08.2022 15:52, Conor Dooley wrote:
> The MSS pll is not a fixed frequency clock, so add set() & round_rate()
> support.
> Control is limited to a 7 bit output divider as other devices on the
> FPGA occupy the other three outputs of the PLL & prevent changing
> the multiplier.
>
> Reviewed-by: Daire McNamara <daire.mcnamara@microchip.com>
> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
> ---
> drivers/clk/microchip/clk-mpfs.c | 54 ++++++++++++++++++++++++++++++++
> 1 file changed, 54 insertions(+)
>
> diff --git a/drivers/clk/microchip/clk-mpfs.c b/drivers/clk/microchip/clk-mpfs.c
> index 43cc9583cd14..008b76d81485 100644
> --- a/drivers/clk/microchip/clk-mpfs.c
> +++ b/drivers/clk/microchip/clk-mpfs.c
> @@ -131,8 +131,62 @@ static unsigned long mpfs_clk_msspll_recalc_rate(struct clk_hw *hw, unsigned lon
> return prate * mult / (ref_div * MSSPLL_FIXED_DIV * postdiv);
> }
>
> +static long mpfs_clk_msspll_round_rate(struct clk_hw *hw, unsigned long rate, unsigned long *prate)
> +{
> + struct mpfs_msspll_hw_clock *msspll_hw = to_mpfs_msspll_clk(hw);
> + void __iomem *mult_addr = msspll_hw->base + msspll_hw->reg_offset;
> + void __iomem *ref_div_addr = msspll_hw->base + REG_MSSPLL_REF_CR;
> + u32 mult, ref_div;
> + unsigned long rate_before_ctrl;
> +
> + mult = readl_relaxed(mult_addr) >> MSSPLL_FBDIV_SHIFT;
> + mult &= clk_div_mask(MSSPLL_FBDIV_WIDTH);
> + ref_div = readl_relaxed(ref_div_addr) >> MSSPLL_REFDIV_SHIFT;
> + ref_div &= clk_div_mask(MSSPLL_REFDIV_WIDTH);
> +
> + rate_before_ctrl = rate * (ref_div * MSSPLL_FIXED_DIV) / mult;
> +
> + return divider_round_rate(hw, rate_before_ctrl, prate, NULL, MSSPLL_POSTDIV_WIDTH,
> + msspll_hw->flags);
> +}
> +
> +static int mpfs_clk_msspll_set_rate(struct clk_hw *hw, unsigned long rate, unsigned long prate)
> +{
> + struct mpfs_msspll_hw_clock *msspll_hw = to_mpfs_msspll_clk(hw);
> + void __iomem *mult_addr = msspll_hw->base + msspll_hw->reg_offset;
> + void __iomem *ref_div_addr = msspll_hw->base + REG_MSSPLL_REF_CR;
> + void __iomem *postdiv_addr = msspll_hw->base + REG_MSSPLL_POSTDIV_CR;
> + u32 mult, ref_div, postdiv;
> + int divider_setting;
> + unsigned long rate_before_ctrl, flags;
> +
> + mult = readl_relaxed(mult_addr) >> MSSPLL_FBDIV_SHIFT;
> + mult &= clk_div_mask(MSSPLL_FBDIV_WIDTH);
> + ref_div = readl_relaxed(ref_div_addr) >> MSSPLL_REFDIV_SHIFT;
> + ref_div &= clk_div_mask(MSSPLL_REFDIV_WIDTH);
> +
> + rate_before_ctrl = rate * (ref_div * MSSPLL_FIXED_DIV) / mult;
> + divider_setting = divider_get_val(rate_before_ctrl, prate, NULL, MSSPLL_POSTDIV_WIDTH,
> + msspll_hw->flags);
> +
> + if (divider_setting < 0)
> + return divider_setting;
> +
> + spin_lock_irqsave(&mpfs_clk_lock, flags);
> +
> + postdiv = readl_relaxed(postdiv_addr);
> + postdiv &= ~(clk_div_mask(MSSPLL_POSTDIV_WIDTH) << MSSPLL_POSTDIV_SHIFT);
> + writel_relaxed(postdiv, postdiv_addr);
> +
> + spin_unlock_irqrestore(&mpfs_clk_lock, flags);
> +
> + return 0;
> +}
> +
> static const struct clk_ops mpfs_clk_msspll_ops = {
> .recalc_rate = mpfs_clk_msspll_recalc_rate,
> + .round_rate = mpfs_clk_msspll_round_rate,
> + .set_rate = mpfs_clk_msspll_set_rate,
> };
>
> #define CLK_PLL(_id, _name, _parent, _shift, _width, _flags, _offset) { \
next prev parent reply other threads:[~2022-09-08 6:46 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 12:50 [PATCH v4 00/13] PolarFire SoC reset controller & clock cleanups Conor Dooley
2022-08-30 12:52 ` [PATCH v4 01/13] clk: microchip: mpfs: fix clk_cfg array bounds violation Conor Dooley
2022-08-31 17:03 ` Conor.Dooley
2022-09-08 6:44 ` Claudiu.Beznea
2022-09-08 6:48 ` Conor.Dooley
2022-09-09 11:01 ` Conor.Dooley
2022-08-30 12:52 ` [PATCH v4 02/13] dt-bindings: clk: microchip: mpfs: add reset controller support Conor Dooley
2022-08-30 12:52 ` [PATCH v4 03/13] clk: microchip: mpfs: add reset controller Conor Dooley
2022-09-08 6:45 ` Claudiu.Beznea
2022-08-30 12:52 ` [PATCH v4 04/13] reset: add polarfire soc reset support Conor Dooley
2022-09-08 6:44 ` Claudiu.Beznea
2022-08-30 12:52 ` [PATCH v4 05/13] MAINTAINERS: add polarfire soc reset controller Conor Dooley
2022-08-30 12:52 ` [PATCH v4 06/13] riscv: dts: microchip: add mpfs specific macb reset support Conor Dooley
2022-08-30 12:52 ` [PATCH v4 07/13] clk: microchip: mpfs: add MSS pll's set & round rate Conor Dooley
2022-09-08 6:46 ` Claudiu.Beznea [this message]
2022-08-30 12:52 ` [PATCH v4 08/13] clk: microchip: mpfs: move id & offset out of clock structs Conor Dooley
2022-09-08 6:46 ` Claudiu.Beznea
2022-08-30 12:52 ` [PATCH v4 09/13] clk: microchip: mpfs: simplify control reg access Conor Dooley
2022-09-08 6:46 ` Claudiu.Beznea
2022-08-30 12:52 ` [PATCH v4 10/13] clk: microchip: mpfs: delete 2 line mpfs_clk_register_foo() Conor Dooley
2022-09-08 6:47 ` Claudiu.Beznea
2022-08-30 12:52 ` [PATCH v4 11/13] clk: microchip: mpfs: convert cfg_clk to clk_divider Conor Dooley
2022-09-08 6:47 ` Claudiu.Beznea
2022-08-30 12:52 ` [PATCH v4 12/13] clk: microchip: mpfs: convert periph_clk to clk_gate Conor Dooley
2022-09-08 6:47 ` Claudiu.Beznea
2022-08-30 12:52 ` [PATCH v4 13/13] clk: microchip: mpfs: update module authorship & licencing Conor Dooley
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=b7304717-a14a-a677-1a5e-09477a5ac6c6@microchip.com \
--to=claudiu.beznea@microchip.com \
--cc=Conor.Dooley@microchip.com \
--cc=Daire.McNamara@microchip.com \
--cc=aou@eecs.berkeley.edu \
--cc=devicetree@vger.kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=mturquette@baylibre.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.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).