diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-10-30 14:52:51 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-10-30 14:52:51 +0100 |
| commit | e573bdb324c78fac56655a493bea843842c9d9f8 (patch) | |
| tree | 3933d354a6be71cbe66d583fec3f5b2479e596ee /drivers/i2c/zynq_i2c.c | |
| parent | a69fdc7787bfa2f27eed74c2ee58c28ce932d502 (diff) | |
| parent | 0eb4cf9c14315e1976a116de75da6f420ac0e8dd (diff) | |
| download | u-boot-imx-e573bdb324c78fac56655a493bea843842c9d9f8.zip u-boot-imx-e573bdb324c78fac56655a493bea843842c9d9f8.tar.gz u-boot-imx-e573bdb324c78fac56655a493bea843842c9d9f8.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'drivers/i2c/zynq_i2c.c')
| -rw-r--r-- | drivers/i2c/zynq_i2c.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/i2c/zynq_i2c.c b/drivers/i2c/zynq_i2c.c index b3264af..380863b 100644 --- a/drivers/i2c/zynq_i2c.c +++ b/drivers/i2c/zynq_i2c.c @@ -297,11 +297,15 @@ static unsigned int zynq_i2c_set_bus_speed(struct i2c_adapter *adap, return 0; } +#ifdef CONFIG_ZYNQ_I2C0 U_BOOT_I2C_ADAP_COMPLETE(zynq_0, zynq_i2c_init, zynq_i2c_probe, zynq_i2c_read, zynq_i2c_write, zynq_i2c_set_bus_speed, CONFIG_SYS_I2C_ZYNQ_SPEED, CONFIG_SYS_I2C_ZYNQ_SLAVE, 0) +#endif +#ifdef CONFIG_ZYNQ_I2C1 U_BOOT_I2C_ADAP_COMPLETE(zynq_1, zynq_i2c_init, zynq_i2c_probe, zynq_i2c_read, zynq_i2c_write, zynq_i2c_set_bus_speed, CONFIG_SYS_I2C_ZYNQ_SPEED, CONFIG_SYS_I2C_ZYNQ_SLAVE, 1) +#endif |