From: Phil Elwell <phil@raspberrypi.org>
Date: Wed, 1 Mar 2017 16:06:53 +0000 (+0000)
Subject: clk-bcm2835: Correct the prediv logic
X-Git-Tag: archive/raspbian/4.9.51-1+rpi1~5^2~346
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b9d10862685a55946fc9c308fc258a7b488bda75;p=linux-4.9.git

clk-bcm2835: Correct the prediv logic

If a clock has the prediv flag set, both the integer and fractional
parts must be scaled when calculating the resulting frequency.

Signed-off-by: Phil Elwell <phil@raspberrypi.org>
---

diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
index 6b245357e4e9..8ea29fbc8dc4 100644
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -616,8 +616,10 @@ static unsigned long bcm2835_pll_get_rate(struct clk_hw *hw,
 	using_prediv = cprman_read(cprman, data->ana_reg_base + 4) &
 		data->ana->fb_prediv_mask;
 
-	if (using_prediv)
+	if (using_prediv) {
 		ndiv *= 2;
+		fdiv *= 2;
+	}
 
 	return bcm2835_pll_rate_from_divisors(parent_rate, ndiv, fdiv, pdiv);
 }