]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
clk-bcm2835: Correct the prediv logic
authorPhil Elwell <phil@raspberrypi.org>
Wed, 1 Mar 2017 16:06:53 +0000 (16:06 +0000)
committerAndy Whitcroft <apw@canonical.com>
Thu, 13 Jul 2017 16:49:53 +0000 (17:49 +0100)
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>
drivers/clk/bcm/clk-bcm2835.c

index eec6735505c074c0a76ae647bf0e1bb68ab3a488..e0d28add45efdf70d1eba590282a3a2654af328d 100644 (file)
@@ -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);
 }