diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-28 07:22:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-28 07:22:51 -0400 |
| commit | ab0a6a5dba740afb490e6e7d417e345284e0dbec (patch) | |
| tree | f199b56253afa3370e7cb36fdeffdc682b216347 /drivers | |
| parent | b147ff2f37d5b3284e04d178d645363a645708bb (diff) | |
| parent | 009902a871dcb1ad60e746280372f47d90f65353 (diff) | |
| download | talos-obmc-uboot-ab0a6a5dba740afb490e6e7d417e345284e0dbec.tar.gz talos-obmc-uboot-ab0a6a5dba740afb490e6e7d417e345284e0dbec.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'drivers')
| -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 b3264af452..380863bde1 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 |
