Skip to content

Commit

Permalink
clk: vt8500: Fix device clock divisor calculations
Browse files Browse the repository at this point in the history
When calculating device clock divisor values in set_rate and
round_rate, we do a simple integer divide. If parent_rate / rate
has a fraction, this is dropped which results in the device clock
being set too high.

This patch corrects the problem by adding 1 to the calculated
divisor if the division would have had a decimal result.

Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
  • Loading branch information
Tony Prisk authored and Mike Turquette committed Jan 16, 2013
1 parent 35a5db5 commit 7248001
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/clk/clk-vt8500.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@ static long vt8500_dclk_round_rate(struct clk_hw *hw, unsigned long rate,
struct clk_device *cdev = to_clk_device(hw);
u32 divisor = *prate / rate;

/* If prate / rate would be decimal, incr the divisor */
if (rate * divisor < *prate)
divisor++;

/*
* If this is a request for SDMMC we have to adjust the divisor
* when >31 to use the fixed predivisor
Expand All @@ -141,6 +145,10 @@ static int vt8500_dclk_set_rate(struct clk_hw *hw, unsigned long rate,
u32 divisor = parent_rate / rate;
unsigned long flags = 0;

/* If prate / rate would be decimal, incr the divisor */
if (rate * divisor < *prate)
divisor++;

if (divisor == cdev->div_mask + 1)
divisor = 0;

Expand Down

0 comments on commit 7248001

Please sign in to comment.