clk: bcm2835: fix bcm2835_clock_choose_div
authorStefan Wahren <stefan.wahren@i2se.com>
Thu, 28 Apr 2022 18:30:10 +0000 (20:30 +0200)
committerStephen Boyd <sboyd@kernel.org>
Tue, 17 May 2022 07:00:34 +0000 (00:00 -0700)
The commit 09e3b18ca5de ("clk: bcm2835: Remove unused variable")
accidentially breaks the behavior of bcm2835_clock_choose_div() and
booting of Raspberry Pi. The removed do_div macro call had side effects,
so we need to restore it.

Fixes: 09e3b18ca5de ("clk: bcm2835: Remove unused variable")
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/20220428183010.1635248-1-stefan.wahren@i2se.com
Tested-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Maxime Ripard <maxime@cerno.tech>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/clk/bcm/clk-bcm2835.c

index 3ad20e75fd23f6b7e60de0b59b87f52285f66736..48a1eb9f2d551cc17b45c45925232dedbf577f49 100644 (file)
@@ -941,6 +941,7 @@ static u32 bcm2835_clock_choose_div(struct clk_hw *hw,
        u64 temp = (u64)parent_rate << CM_DIV_FRAC_BITS;
        u32 div, mindiv, maxdiv;
 
+       do_div(temp, rate);
        div = temp;
        div &= ~unused_frac_mask;