]> git.proxmox.com Git - mirror_ubuntu-zesty-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)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 8 Aug 2017 12:51:58 +0000 (14:51 +0200)
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 0b62d20f8b718cfd03c0346af784688e26e9dcb6..ef0d05c58573f62de3632a920dfc19888c019d18 100644 (file)
@@ -535,8 +535,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);
 }