From: kernel@martin.sperl.org (kernel at martin.sperl.org)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/6] clk: bcm2835: divider value has to be 1 or more
Date: Mon, 29 Feb 2016 11:39:20 +0000 [thread overview]
Message-ID: <1456745963-2403-5-git-send-email-kernel@martin.sperl.org> (raw)
In-Reply-To: <1456745963-2403-1-git-send-email-kernel@martin.sperl.org>
From: Martin Sperl <kernel@martin.sperl.org>
Current clamping of a normal divider allows a value < 1 to be valid.
A divider of < 1 would actually only be possible if we had a PLL...
So this patch clamps the divider to 1.
Fixes: 41691b8862e2 ("clk: bcm2835: Add support for programming the
audio domain clocks")
Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
---
drivers/clk/bcm/clk-bcm2835.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
index 1fbb55d..edb1f74 100644
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1194,8 +1194,9 @@ static u32 bcm2835_clock_choose_div(struct clk_hw *hw,
div += unused_frac_mask + 1;
div &= ~unused_frac_mask;
- /* Clamp to the limits. */
- div = max(div, unused_frac_mask + 1);
+ /* clamp to min divider of 1 */
+ div = max_t(u32, div, 1 << CM_DIV_FRAC_BITS);
+ /* clamp to the highest possible fractional divider */
div = min_t(u32, div, GENMASK(data->int_bits + CM_DIV_FRAC_BITS - 1,
CM_DIV_FRAC_BITS - data->frac_bits));
--
1.7.10.4
next prev parent reply other threads:[~2016-02-29 11:39 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 11:39 [PATCH 0/6] clk: bcm2835: fixes clk-bcm2835 driver issues kernel at martin.sperl.org
2016-02-29 11:39 ` [PATCH 1/6] clk: bcm2835: pll_off should only set CM_PLL_ANARST kernel at martin.sperl.org
2016-02-29 20:03 ` Eric Anholt
2016-02-29 11:39 ` [PATCH 2/6] clk: bcm2835: add locking to pll*_on/off methods kernel at martin.sperl.org
2016-02-29 20:06 ` Eric Anholt
2016-02-29 11:39 ` [PATCH 3/6] clk: bcm2835: enable clocks that have been enabled by firmware kernel at martin.sperl.org
2016-02-29 20:09 ` Eric Anholt
2016-03-17 17:39 ` Eric Anholt
2016-03-17 18:13 ` Martin Sperl
2016-03-17 18:23 ` Eric Anholt
2016-04-26 7:48 ` Martin Sperl
2016-02-29 11:39 ` kernel at martin.sperl.org [this message]
2016-02-29 20:11 ` [PATCH 4/6] clk: bcm2835: divider value has to be 1 or more Eric Anholt
2016-02-29 11:39 ` [PATCH 5/6] clk: bcm2835: correctly enable fractional clock support kernel at martin.sperl.org
2016-02-29 20:33 ` Eric Anholt
2016-02-29 21:59 ` Martin Sperl
2016-02-29 23:44 ` Eric Anholt
2016-03-01 5:52 ` Martin Sperl
2016-02-29 11:39 ` [PATCH 6/6] clk: bcm2835: clean up coding style issues kernel at martin.sperl.org
2016-02-29 20:20 ` Eric Anholt
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=1456745963-2403-5-git-send-email-kernel@martin.sperl.org \
--to=kernel@martin.sperl.org \
--cc=linux-arm-kernel@lists.infradead.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).