summaryrefslogtreecommitdiffstats
path: root/drivers/clk/clk-vt8500.c
diff options
context:
space:
mode:
authorTony Prisk <linux@prisktech.co.nz>2012-12-26 19:14:30 -0500
committerMike Turquette <mturquette@linaro.org>2013-01-15 19:16:24 -0500
commit72480014b86c8b51fb51c5c6a0525876055c37c7 (patch)
tree7c9d0254c7dda9d1089415814ac72f7190ba7271 /drivers/clk/clk-vt8500.c
parent35a5db55ab96eadb07b3d5f7258558c680ebc2f0 (diff)
clk: vt8500: Fix device clock divisor calculations
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>
Diffstat (limited to 'drivers/clk/clk-vt8500.c')
-rw-r--r--drivers/clk/clk-vt8500.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/clk/clk-vt8500.c b/drivers/clk/clk-vt8500.c
index 0cb26bef427d..3306c2b1906c 100644
--- a/drivers/clk/clk-vt8500.c
+++ b/drivers/clk/clk-vt8500.c
@@ -123,6 +123,10 @@ static long vt8500_dclk_round_rate(struct clk_hw *hw, unsigned long rate,
123 struct clk_device *cdev = to_clk_device(hw); 123 struct clk_device *cdev = to_clk_device(hw);
124 u32 divisor = *prate / rate; 124 u32 divisor = *prate / rate;
125 125
126 /* If prate / rate would be decimal, incr the divisor */
127 if (rate * divisor < *prate)
128 divisor++;
129
126 /* 130 /*
127 * If this is a request for SDMMC we have to adjust the divisor 131 * If this is a request for SDMMC we have to adjust the divisor
128 * when >31 to use the fixed predivisor 132 * when >31 to use the fixed predivisor
@@ -141,6 +145,10 @@ static int vt8500_dclk_set_rate(struct clk_hw *hw, unsigned long rate,
141 u32 divisor = parent_rate / rate; 145 u32 divisor = parent_rate / rate;
142 unsigned long flags = 0; 146 unsigned long flags = 0;
143 147
148 /* If prate / rate would be decimal, incr the divisor */
149 if (rate * divisor < *prate)
150 divisor++;
151
144 if (divisor == cdev->div_mask + 1) 152 if (divisor == cdev->div_mask + 1)
145 divisor = 0; 153 divisor = 0;
146 154