diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2015-11-03 20:01:40 -0500 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-11-30 15:58:38 -0500 |
commit | 0d2681e1f19162e5975b70edd0c2d1d256f38023 (patch) | |
tree | f6e8639f12177043155a4f5df7a5e833160f4c18 | |
parent | 741e96e8790cbd389d27e29bbf66de2c691fd775 (diff) |
imx/clk-pllv2: fix wrong do_div() usage
do_div() is meant to be used with an unsigned dividend.
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r-- | drivers/clk/imx/clk-pllv2.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/clk/imx/clk-pllv2.c b/drivers/clk/imx/clk-pllv2.c index b18f875eac6a..4aeda56ce372 100644 --- a/drivers/clk/imx/clk-pllv2.c +++ b/drivers/clk/imx/clk-pllv2.c | |||
@@ -79,7 +79,7 @@ static unsigned long __clk_pllv2_recalc_rate(unsigned long parent_rate, | |||
79 | { | 79 | { |
80 | long mfi, mfn, mfd, pdf, ref_clk; | 80 | long mfi, mfn, mfd, pdf, ref_clk; |
81 | unsigned long dbl; | 81 | unsigned long dbl; |
82 | s64 temp; | 82 | u64 temp; |
83 | 83 | ||
84 | dbl = dp_ctl & MXC_PLL_DP_CTL_DPDCK0_2_EN; | 84 | dbl = dp_ctl & MXC_PLL_DP_CTL_DPDCK0_2_EN; |
85 | 85 | ||
@@ -98,8 +98,9 @@ static unsigned long __clk_pllv2_recalc_rate(unsigned long parent_rate, | |||
98 | temp = (u64) ref_clk * abs(mfn); | 98 | temp = (u64) ref_clk * abs(mfn); |
99 | do_div(temp, mfd + 1); | 99 | do_div(temp, mfd + 1); |
100 | if (mfn < 0) | 100 | if (mfn < 0) |
101 | temp = -temp; | 101 | temp = (ref_clk * mfi) - temp; |
102 | temp = (ref_clk * mfi) + temp; | 102 | else |
103 | temp = (ref_clk * mfi) + temp; | ||
103 | 104 | ||
104 | return temp; | 105 | return temp; |
105 | } | 106 | } |
@@ -126,7 +127,7 @@ static int __clk_pllv2_set_rate(unsigned long rate, unsigned long parent_rate, | |||
126 | { | 127 | { |
127 | u32 reg; | 128 | u32 reg; |
128 | long mfi, pdf, mfn, mfd = 999999; | 129 | long mfi, pdf, mfn, mfd = 999999; |
129 | s64 temp64; | 130 | u64 temp64; |
130 | unsigned long quad_parent_rate; | 131 | unsigned long quad_parent_rate; |
131 | 132 | ||
132 | quad_parent_rate = 4 * parent_rate; | 133 | quad_parent_rate = 4 * parent_rate; |