diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-04-01 22:47:03 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-04-01 22:47:03 +0200 |
| commit | ed9953d6903c9673135a96ae1644f61cb0eac5ce (patch) | |
| tree | 5d3fb93c4a1ddab7527e6d6cad5946f84392ce34 | |
| parent | da72af8d727e74093e5fcb3e8599eb8d0df7a749 (diff) | |
| parent | d144f94d590b5190a9963bd0f2026b2a7ce67eda (diff) | |
| download | u-boot-imx-ed9953d6903c9673135a96ae1644f61cb0eac5ce.zip u-boot-imx-ed9953d6903c9673135a96ae1644f61cb0eac5ce.tar.gz u-boot-imx-ed9953d6903c9673135a96ae1644f61cb0eac5ce.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
| -rw-r--r-- | drivers/i2c/soft_i2c.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c index ed5f5b2..185634d 100644 --- a/drivers/i2c/soft_i2c.c +++ b/drivers/i2c/soft_i2c.c @@ -51,14 +51,12 @@ DECLARE_GLOBAL_DATA_PTR; #endif - /*----------------------------------------------------------------------- * Definitions */ #define RETRIES 0 - #define I2C_ACK 0 /* PD_SDA level to ack a byte */ #define I2C_NOACK 1 /* PD_SDA level to noack a byte */ @@ -154,7 +152,6 @@ static void send_stop(void) I2C_TRISTATE; } - /*----------------------------------------------------------------------- * ack should be I2C_ACK or I2C_NOACK */ @@ -174,7 +171,6 @@ static void send_ack(int ack) I2C_DELAY; } - /*----------------------------------------------------------------------- * Send 8 bits and look for an acknowledgement. */ @@ -246,6 +242,7 @@ int i2c_set_bus_num(unsigned int bus) #endif return 0; } +#endif /* TODO: add 100/400k switching */ unsigned int i2c_get_bus_speed(void) @@ -260,7 +257,6 @@ int i2c_set_bus_speed(unsigned int speed) return 0; } -#endif /*----------------------------------------------------------------------- * if ack == I2C_ACK, ACK the byte so can continue reading, else |