From: Jerome Brunet <jbrunet@baylibre.com>
To: Stephen Boyd <sboyd@codeaurora.org>,
Michael Turquette <mturquette@baylibre.com>,
linux-clk@vger.kernel.org
Cc: Jerome Brunet <jbrunet@baylibre.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-arm-msm@vger.kernel.org, Vladimir Zapolskiy <vz@mleia.com>,
Sylvain Lemieux <slemieux.tyco@gmail.com>,
Andy Gross <andy.gross@linaro.org>,
David Brown <david.brown@linaro.org>
Subject: [PATCH 5/5] clk: qcom: use divider_ro_round_rate helper
Date: Fri, 5 Jan 2018 18:09:59 +0100 [thread overview]
Message-ID: <20180105170959.17266-6-jbrunet@baylibre.com> (raw)
In-Reply-To: <20180105170959.17266-1-jbrunet@baylibre.com>
There is now an helper function to round the rate when the
divider is read-only. Let's use it
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/clk/qcom/clk-regmap-divider.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/drivers/clk/qcom/clk-regmap-divider.c b/drivers/clk/qcom/clk-regmap-divider.c
index 4e9b8c2c8980..114e36b97255 100644
--- a/drivers/clk/qcom/clk-regmap-divider.c
+++ b/drivers/clk/qcom/clk-regmap-divider.c
@@ -28,22 +28,15 @@ static long div_round_ro_rate(struct clk_hw *hw, unsigned long rate,
{
struct clk_regmap_div *divider = to_clk_regmap_div(hw);
struct clk_regmap *clkr = ÷r->clkr;
- u32 div;
+ u32 val;
struct clk_hw *hw_parent = clk_hw_get_parent(hw);
- regmap_read(clkr->regmap, divider->reg, &div);
- div >>= divider->shift;
- div &= BIT(divider->width) - 1;
- div += 1;
-
- if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) {
- if (!hw_parent)
- return -EINVAL;
-
- *prate = clk_hw_round_rate(hw_parent, rate * div);
- }
+ regmap_read(clkr->regmap, divider->reg, &val);
+ val >>= divider->shift;
+ val &= BIT(divider->width) - 1;
- return DIV_ROUND_UP_ULL((u64)*prate, div);
+ return divider_ro_round_rate(hw, rate, prate, NULL, divider->width,
+ CLK_DIVIDER_ROUND_CLOSEST, val);
}
static long div_round_rate(struct clk_hw *hw, unsigned long rate,
--
2.14.3
next prev parent reply other threads:[~2018-01-05 17:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-05 17:09 [PATCH 0/5] clk: read-only dividers and rate propagation fixup Jerome Brunet
2018-01-05 17:09 ` [PATCH 1/5] clk: divider: read-only divider can propagate rate change Jerome Brunet
2018-01-11 22:55 ` [1/5] " David Lechner
2018-01-17 16:39 ` Jerome Brunet
2018-01-05 17:09 ` [PATCH 2/5] clk: lpc32xx: " Jerome Brunet
2018-01-05 18:12 ` Vladimir Zapolskiy
2018-01-05 19:40 ` Jerome Brunet
2018-01-06 14:04 ` Vladimir Zapolskiy
2018-01-08 9:10 ` Jerome Brunet
2018-01-05 17:09 ` [PATCH 3/5] clk: divider: add divider_ro_round_rate helper Jerome Brunet
2018-01-11 23:08 ` [3/5] " David Lechner
2018-01-17 17:47 ` Jerome Brunet
2018-01-17 17:55 ` David Lechner
2018-01-05 17:09 ` [PATCH 4/5] clk: lpc32xx: use " Jerome Brunet
2018-01-05 17:09 ` Jerome Brunet [this message]
2018-01-08 10:04 ` [PATCH 5/5] clk: qcom: " Jerome Brunet
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=20180105170959.17266-6-jbrunet@baylibre.com \
--to=jbrunet@baylibre.com \
--cc=andy.gross@linaro.org \
--cc=david.brown@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=mturquette@baylibre.com \
--cc=sboyd@codeaurora.org \
--cc=slemieux.tyco@gmail.com \
--cc=vz@mleia.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).