summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Wells <wellsk40@gmail.com>2010-03-16 23:55:36 +0100
committerBen Dooks <ben-linux@fluff.org>2010-04-20 02:16:57 +0200
commitbe80dbaa3ed64337693be58fb2f3808e78911ba6 (patch)
tree0fd671b707e584ac7cedf4166063b7185d620fa4
parenti2c-omap: fix OOPS in omap_i2c_unidle() during probe (diff)
downloadlinux-be80dbaa3ed64337693be58fb2f3808e78911ba6.tar.xz
linux-be80dbaa3ed64337693be58fb2f3808e78911ba6.zip
i2c-pnx: Limit maximum divider to 1023
Limit maximum divider to 0x3ff to divider computations. On high I2C parent clock rates, the divider can exceed 0x3ff. This will help prevent some very odd clock rates. Signed-off-by: Kevin Wells <wellsk40@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r--drivers/i2c/busses/i2c-pnx.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 247103372a06..68fa415d9ad5 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -633,6 +633,8 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
*/
tmp = ((freq / 1000) / I2C_PNX_SPEED_KHZ) / 2 - 2;
+ if (tmp > 0x3FF)
+ tmp = 0x3FF;
iowrite32(tmp, I2C_REG_CKH(alg_data));
iowrite32(tmp, I2C_REG_CKL(alg_data));