Merge branch 'master' of http://git.denx.de/u-boot-sunxi

[u-boot] / drivers / i2c / mxs_i2c.c

diff --git a/drivers/i2c/mxs_i2c.c b/drivers/i2c/mxs_i2c.c
index d3cb7274f3086d2e82a4ca9a9fb32de0bd75ee9a..87e05c71254920802b41aba409601277a192de94 100644 (file)
--- a/drivers/i2c/mxs_i2c.c
+++ b/drivers/i2c/mxs_i2c.c
@@ -26,7 +26,10 @@
 
 static struct mxs_i2c_regs *mxs_i2c_get_base(struct i2c_adapter *adap)
 {
-       return (struct mxs_i2c_regs *)MXS_I2C0_BASE;
+       if (adap->hwadapnr == 0)
+               return (struct mxs_i2c_regs *)MXS_I2C0_BASE;
+       else
+               return (struct mxs_i2c_regs *)MXS_I2C1_BASE;
 }
 
 static unsigned int mxs_i2c_get_bus_speed(struct i2c_adapter *adap)
@@ -311,3 +314,7 @@ U_BOOT_I2C_ADAP_COMPLETE(mxs0, mxs_i2c_init, mxs_i2c_probe,
                         mxs_i2c_if_read, mxs_i2c_if_write,
                         mxs_i2c_set_bus_speed,
                         CONFIG_SYS_I2C_SPEED, 0, 0)
+U_BOOT_I2C_ADAP_COMPLETE(mxs1, mxs_i2c_init, mxs_i2c_probe,
+                        mxs_i2c_if_read, mxs_i2c_if_write,
+                        mxs_i2c_set_bus_speed,
+                        CONFIG_SYS_I2C_SPEED, 0, 1)