diff options
| author | Tom Rini <trini@ti.com> | 2015-02-13 13:11:09 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-13 13:11:09 -0500 |
| commit | 757566d1567a98f5c331c14f088001dbfe187191 (patch) | |
| tree | 86c9ab53fbefee672f37165f51db398338bf9968 /drivers/i2c/s3c24x0_i2c.c | |
| parent | c445506d73a0fba6472d12510b2d41148f078349 (diff) | |
| parent | b1f6659c420dae9cd06514fbd8342f39b3f326b9 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/i2c/s3c24x0_i2c.c')
| -rw-r--r-- | drivers/i2c/s3c24x0_i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c index 0dd1abcf80f..b4ee33f7dac 100644 --- a/drivers/i2c/s3c24x0_i2c.c +++ b/drivers/i2c/s3c24x0_i2c.c @@ -112,9 +112,9 @@ #define I2C_START_STOP 0x20 /* START / STOP */ #define I2C_TXRX_ENA 0x10 /* I2C Tx/Rx enable */ -#define I2C_TIMEOUT_MS 1000 /* 1 second */ +#define I2C_TIMEOUT_MS 10 /* 10 ms */ -#define HSI2C_TIMEOUT_US 100000 /* 100 ms, finer granularity */ +#define HSI2C_TIMEOUT_US 10000 /* 10 ms, finer granularity */ /* To support VCMA9 boards and other who dont define max_i2c_num */ |