diff options
| author | Eric Anholt <eric@anholt.net> | 2016-09-30 13:07:27 -0400 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-10-17 18:34:36 -0400 |
| commit | c4e634ce412d97f0e61223b2a5b3f8f9600cd4dc (patch) | |
| tree | 6a6496905df153f26dae703b28b82d907885bee5 | |
| parent | 1c7032258d568f9a7aeb4c541786699d9a219a2a (diff) | |
clk: bcm2835: Clamp the PLL's requested rate to the hardware limits.
Fixes setting low-resolution video modes on HDMI. Now the PLLH_PIX
divider adjusts itself until the PLLH is within bounds.
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
| -rw-r--r-- | drivers/clk/bcm/clk-bcm2835.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c index b68bf573dcfb..8c7763fd9efc 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c | |||
| @@ -502,8 +502,12 @@ static long bcm2835_pll_rate_from_divisors(unsigned long parent_rate, | |||
| 502 | static long bcm2835_pll_round_rate(struct clk_hw *hw, unsigned long rate, | 502 | static long bcm2835_pll_round_rate(struct clk_hw *hw, unsigned long rate, |
| 503 | unsigned long *parent_rate) | 503 | unsigned long *parent_rate) |
| 504 | { | 504 | { |
| 505 | struct bcm2835_pll *pll = container_of(hw, struct bcm2835_pll, hw); | ||
| 506 | const struct bcm2835_pll_data *data = pll->data; | ||
| 505 | u32 ndiv, fdiv; | 507 | u32 ndiv, fdiv; |
| 506 | 508 | ||
| 509 | rate = clamp(rate, data->min_rate, data->max_rate); | ||
| 510 | |||
| 507 | bcm2835_pll_choose_ndiv_and_fdiv(rate, *parent_rate, &ndiv, &fdiv); | 511 | bcm2835_pll_choose_ndiv_and_fdiv(rate, *parent_rate, &ndiv, &fdiv); |
| 508 | 512 | ||
| 509 | return bcm2835_pll_rate_from_divisors(*parent_rate, ndiv, fdiv, 1); | 513 | return bcm2835_pll_rate_from_divisors(*parent_rate, ndiv, fdiv, 1); |
| @@ -608,13 +612,6 @@ static int bcm2835_pll_set_rate(struct clk_hw *hw, | |||
| 608 | u32 ana[4]; | 612 | u32 ana[4]; |
| 609 | int i; | 613 | int i; |
| 610 | 614 | ||
| 611 | if (rate < data->min_rate || rate > data->max_rate) { | ||
| 612 | dev_err(cprman->dev, "%s: rate out of spec: %lu vs (%lu, %lu)\n", | ||
| 613 | clk_hw_get_name(hw), rate, | ||
| 614 | data->min_rate, data->max_rate); | ||
| 615 | return -EINVAL; | ||
| 616 | } | ||
| 617 | |||
| 618 | if (rate > data->max_fb_rate) { | 615 | if (rate > data->max_fb_rate) { |
| 619 | use_fb_prediv = true; | 616 | use_fb_prediv = true; |
| 620 | rate /= 2; | 617 | rate /= 2; |