summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-10-17 16:09:49 (GMT)
committerTom Rini <trini@ti.com>2013-10-17 16:09:49 (GMT)
commit9dff87a297dabe4af60012ad2d990ff8967f1d55 (patch)
tree484a3f5785536d6996c68f538b48590d71b6bd8c /common
parent287df01e6aef0464c5e5bcbd7e87aa4ff1f24f5a (diff)
parent9a2a73d29fa395f42f3fb477ac99dda4d7f2f21f (diff)
downloadu-boot-fsl-qoriq-9dff87a297dabe4af60012ad2d990ff8967f1d55.tar.xz
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'common')
-rw-r--r--common/board_f.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/common/board_f.c b/common/board_f.c
index 0ada1af..f0664bc 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -249,7 +249,11 @@ void dram_init_banksize(void)
static int init_func_i2c(void)
{
puts("I2C: ");
+#ifdef CONFIG_SYS_I2C
+ i2c_init_all();
+#else
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#endif
puts("ready\n");
return 0;
}