diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2018-01-02 20:51:29 -0500 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2018-01-02 20:51:29 -0500 |
commit | 348c898cb897d6663548aada9d68c0d2d7cfba8e (patch) | |
tree | eeb583aa42e224bac5ef654e7b6f6731a6182cdf | |
parent | 65e01ae3f295c6e79f56383dce58716a99d3d866 (diff) | |
parent | 86aacdca66774051cbc0958110a48074b57a060b (diff) |
Merge tag 'meson-clk-for-v4.16-3' of git://github.com/BayLibre/clk-meson into clk-meson
Pull Amlogic clk driver update from Jerome Brunet:
- Fix overflow in the mpll driver on 32bits arch
* tag 'meson-clk-for-v4.16-3' of git://github.com/BayLibre/clk-meson:
clk: meson: mpll: use 64-bit maths in params_from_rate
-rw-r--r-- | drivers/clk/meson/clk-mpll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/meson/clk-mpll.c b/drivers/clk/meson/clk-mpll.c index 44a5a535ca63..5144360e2c80 100644 --- a/drivers/clk/meson/clk-mpll.c +++ b/drivers/clk/meson/clk-mpll.c | |||
@@ -98,7 +98,7 @@ static void params_from_rate(unsigned long requested_rate, | |||
98 | *sdm = SDM_DEN - 1; | 98 | *sdm = SDM_DEN - 1; |
99 | } else { | 99 | } else { |
100 | *n2 = div; | 100 | *n2 = div; |
101 | *sdm = DIV_ROUND_UP(rem * SDM_DEN, requested_rate); | 101 | *sdm = DIV_ROUND_UP_ULL((u64)rem * SDM_DEN, requested_rate); |
102 | } | 102 | } |
103 | } | 103 | } |
104 | 104 | ||