V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ARMV7: OMAP: I2C driver: Use same timeout value as linux kernel driver 

This patch matches the poll interval (1 millisecond) and timeout (1 second)
used in the linux driver. It also adds a return value of 0 in the event of
a timeout error and cleans up some formatting errors in that section of the
code.

Signed-off-by: Steve Sakoman <steve.sakoman@linaro.org>
Tested-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Steve Sakoman 2010-10-20 06:07:44 -07:00 committed by Heiko Schocher
parent 11c8dd36ed
commit 73e8747fe4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/i2c/omap24xx_i2c.c
View File

@ -27,7 +27,7 @@
#include "omap24xx_i2c.h" #include "omap24xx_i2c.h"
#define I2C_TIMEOUT 10 #define I2C_TIMEOUT 1000
static void wait_for_bb (void); static void wait_for_bb (void);
static u16 wait_for_pin (void); static u16 wait_for_pin (void);
@ -392,13 +392,13 @@ int i2c_write (uchar chip, uint addr, int alen, uchar * buffer, int len)
static void wait_for_bb (void) static void wait_for_bb (void)
{ {
int timeout = 10; int timeout = I2C_TIMEOUT;
u16 stat; u16 stat;
writew(0xFFFF, &i2c_base->stat); /* clear current interruts...*/ writew(0xFFFF, &i2c_base->stat); /* clear current interruts...*/
while ((stat = readw (&i2c_base->stat) & I2C_STAT_BB) && timeout--) { while ((stat = readw (&i2c_base->stat) & I2C_STAT_BB) && timeout--) {
writew (stat, &i2c_base->stat); writew (stat, &i2c_base->stat);
udelay (50000); udelay(1000);
} }
if (timeout <= 0) { if (timeout <= 0) {
@ -411,7 +411,7 @@ static void wait_for_bb (void)
static u16 wait_for_pin (void) static u16 wait_for_pin (void)
{ {
u16 status; u16 status;
int timeout = 10; int timeout = I2C_TIMEOUT;
do { do {
udelay (1000); udelay (1000);
@ -425,7 +425,9 @@ static u16 wait_for_pin (void)
printf ("timed out in wait_for_pin: I2C_STAT=%x\n", printf ("timed out in wait_for_pin: I2C_STAT=%x\n",
readw (&i2c_base->stat)); readw (&i2c_base->stat));
writew(0xFFFF, &i2c_base->stat); writew(0xFFFF, &i2c_base->stat);
status = 0;
} }
return status; return status;
} }