Commit f106de56 authored by Stéphan Rafin's avatar Stéphan Rafin Committed by Greg Kroah-Hartman

clk: sunxi: Fix M factor computation for APB1

commit ac95330b upstream.

commit cfa63688 ("clk: sunxi: factors: Consolidate get_factors
parameters into a struct") introduced a regression for m factor
computation in sun4i_get_apb1_factors function.

The old code reassigned the "parent_rate" parameter to the targeted
divisor value and was buggy for the returned frequency but not for the
computed factors. Now, returned frequency is good but m factor is
incorrectly computed (its max value 31 is always set resulting in a
significantly slower frequency than the requested one...)

This patch simply restores the original proper computation for m while
keeping the good changes for returned rate.

Fixes: cfa63688 ("clk: sunxi: factors: Consolidate get_factors parameters into a struct")
Signed-off-by: default avatarStéphan Rafin <stephan@soliotek.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e2d9e95
...@@ -373,7 +373,7 @@ static void sun4i_get_apb1_factors(struct factors_request *req) ...@@ -373,7 +373,7 @@ static void sun4i_get_apb1_factors(struct factors_request *req)
else else
calcp = 3; calcp = 3;
calcm = (req->parent_rate >> calcp) - 1; calcm = (div >> calcp) - 1;
req->rate = (req->parent_rate >> calcp) / (calcm + 1); req->rate = (req->parent_rate >> calcp) / (calcm + 1);
req->m = calcm; req->m = calcm;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment