summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-09-17 11:39:03 -0700
committerTom Rini <trini@ti.com>2012-09-17 11:39:03 -0700
commit037e9d33db9fc86c1e671d64077b2d1a19df7f24 (patch)
tree3fac46460bf6c39eb9775bcc0e1970042666292d /drivers
parentcd40a66c197fd43f761fa398cf785ff1a86250de (diff)
parentfd8dca83ed4b9d960d3b9a0450da12bb32f512f8 (diff)
downloadtalos-obmc-uboot-037e9d33db9fc86c1e671d64077b2d1a19df7f24.tar.gz
talos-obmc-uboot-037e9d33db9fc86c1e671d64077b2d1a19df7f24.zip
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/omap24xx_i2c.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index 978507ba29..094305fdf9 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -442,6 +442,14 @@ int i2c_set_bus_num(unsigned int bus)
return -1;
}
+#if I2C_BUS_MAX == 4
+ if (bus == 3)
+ i2c_base = (struct i2c *)I2C_BASE4;
+ else
+ if (bus == 2)
+ i2c_base = (struct i2c *)I2C_BASE3;
+ else
+#endif
#if I2C_BUS_MAX == 3
if (bus == 2)
i2c_base = (struct i2c *)I2C_BASE3;
OpenPOWER on IntegriCloud