Merge branch 'master' of git://git.denx.de/u-boot

diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c
index 36d4b23bfeb1a8d5c21713ff4837913fa8d3937b..5676a0f083b6b33ada21910348c0f3dc8c79d56c 100644 (file)
--- a/drivers/video/ipu_common.c
+++ b/drivers/video/ipu_common.c
@@ -352,7 +352,9 @@ static int ipu_pixel_clk_set_rate(struct clk *clk, unsigned long rate)
         */
        __raw_writel((div / 16) << 16, DI_BS_CLKGEN1(clk->id));
 
-       clk->rate = (u64)(clk->parent->rate * 16) / div;
+       do_div(parent_rate, div);
+
+       clk->rate = parent_rate;
 
        return 0;
 }