diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-02 09:38:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-02 09:38:44 -0400 |
| commit | b8d242121dd3c8c418751c37e6f7157cf6428dbf (patch) | |
| tree | 53f1fc557eff2989a27402b7dd226949fd61533f /drivers | |
| parent | 4bbc08f2ecdd16d38f933f202fb1a711fb30d880 (diff) | |
| parent | 7daaac5281db0788cde895a0add38ad5195b5be1 (diff) | |
| download | talos-obmc-uboot-b8d242121dd3c8c418751c37e6f7157cf6428dbf.tar.gz talos-obmc-uboot-b8d242121dd3c8c418751c37e6f7157cf6428dbf.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/mxc_i2c.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index f1056e21a2..0f977d706d 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -612,16 +612,22 @@ static u32 mxc_i2c_set_bus_speed(struct i2c_adapter *adap, uint speed) /* * Register mxc i2c adapters */ +#ifdef CONFIG_SYS_I2C_MXC_I2C1 U_BOOT_I2C_ADAP_COMPLETE(mxc0, mxc_i2c_init, mxc_i2c_probe, mxc_i2c_read, mxc_i2c_write, mxc_i2c_set_bus_speed, CONFIG_SYS_MXC_I2C1_SPEED, CONFIG_SYS_MXC_I2C1_SLAVE, 0) +#endif + +#ifdef CONFIG_SYS_I2C_MXC_I2C2 U_BOOT_I2C_ADAP_COMPLETE(mxc1, mxc_i2c_init, mxc_i2c_probe, mxc_i2c_read, mxc_i2c_write, mxc_i2c_set_bus_speed, CONFIG_SYS_MXC_I2C2_SPEED, CONFIG_SYS_MXC_I2C2_SLAVE, 1) +#endif + #ifdef CONFIG_SYS_I2C_MXC_I2C3 U_BOOT_I2C_ADAP_COMPLETE(mxc2, mxc_i2c_init, mxc_i2c_probe, mxc_i2c_read, mxc_i2c_write, |
