projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix e-mail address of Gary Jennejohn.
[oweals/u-boot.git]
/
cpu
/
mpc5xxx
/
i2c.c
diff --git
a/cpu/mpc5xxx/i2c.c
b/cpu/mpc5xxx/i2c.c
index e2506d82f2876af48aa5bec54d89ebaf1a09c4df..23419324ba592b6091fef2081d9ec9aec09605b6 100644
(file)
--- a/
cpu/mpc5xxx/i2c.c
+++ b/
cpu/mpc5xxx/i2c.c
@@
-38,7
+38,7
@@
DECLARE_GLOBAL_DATA_PTR;
#error CONFIG_SYS_I2C_MODULE is not properly configured
#endif
#error CONFIG_SYS_I2C_MODULE is not properly configured
#endif
-#define I2C_TIMEOUT
100
+#define I2C_TIMEOUT
6667
#define I2C_RETRIES 3
struct mpc5xxx_i2c_tap {
#define I2C_RETRIES 3
struct mpc5xxx_i2c_tap {
@@
-94,7
+94,7
@@
static int wait_for_bb(void)
mpc_reg_out(®s->mcr, 0, 0);
mpc_reg_out(®s->mcr, I2C_EN, 0);
#endif
mpc_reg_out(®s->mcr, 0, 0);
mpc_reg_out(®s->mcr, I2C_EN, 0);
#endif
- udelay(1
000
);
+ udelay(1
5
);
status = mpc_reg_in(®s->msr);
}
status = mpc_reg_in(®s->msr);
}
@@
-109,7
+109,7
@@
static int wait_for_pin(int *status)
*status = mpc_reg_in(®s->msr);
while (timeout-- && !(*status & I2C_IF)) {
*status = mpc_reg_in(®s->msr);
while (timeout-- && !(*status & I2C_IF)) {
- udelay(1
000
);
+ udelay(1
5
);
*status = mpc_reg_in(®s->msr);
}
*status = mpc_reg_in(®s->msr);
}