diff options
| author | Tom Rini <trini@ti.com> | 2013-08-20 11:34:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-08-20 11:34:24 -0400 |
| commit | 63980c296aad0708f486d9229394b9000c874a90 (patch) | |
| tree | cf04c10cab0ca6786529b62ee0a4f3f82089d301 /include | |
| parent | 39bc12ddc36c9e30199471da0f3a929b178a04b2 (diff) | |
| parent | 3fbb517f30fe68e29640bee63ab366569914d898 (diff) | |
| download | u-boot-imx-63980c296aad0708f486d9229394b9000c874a90.zip u-boot-imx-63980c296aad0708f486d9229394b9000c874a90.tar.gz u-boot-imx-63980c296aad0708f486d9229394b9000c874a90.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/trats.h | 3 | ||||
| -rw-r--r-- | include/i2c.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/configs/trats.h b/include/configs/trats.h index 9b6aac9..24ea06b 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -263,6 +263,9 @@ #define CONFIG_SYS_I2C_SOFT /* I2C bit-banged */ #define CONFIG_SYS_I2C_SOFT_SPEED 50000 #define CONFIG_SYS_I2C_SOFT_SLAVE 0xFE +#define I2C_SOFT_DECLARATIONS2 +#define CONFIG_SYS_I2C_SOFT_SPEED_2 50000 +#define CONFIG_SYS_I2C_SOFT_SLAVE_2 0x7F #define CONFIG_SOFT_I2C_READ_REPEATED_START #define CONFIG_SYS_I2C_INIT_BOARD #define CONFIG_I2C_MULTI_BUS diff --git a/include/i2c.h b/include/i2c.h index d8674ef..8fd17d1 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -390,7 +390,7 @@ unsigned int i2c_get_bus_speed(void); # if !defined(CONFIG_SYS_MAX_I2C_BUS) # define CONFIG_SYS_MAX_I2C_BUS 2 # endif -# define I2C_MULTI_BUS 0 +# define I2C_MULTI_BUS 1 #else # define CONFIG_SYS_MAX_I2C_BUS 1 # define I2C_MULTI_BUS 0 |