summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-09-09 09:35:38 -0400
committerTom Rini <trini@ti.com>2013-09-09 09:35:38 -0400
commit89993dc34afeeca4dad84e3c2db7403c406ccb78 (patch)
tree7d6995bdf740e5919c0b7a6c0aca54e455f22a26 /board
parent47f75cf2e1d8648e3438630f3a4bddf9b5caa25d (diff)
parentf62b123813ea604d16ed6115fe2fa552b23d9102 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'board')
-rw-r--r--board/freescale/p1022ds/spl.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/board/freescale/p1022ds/spl.c b/board/freescale/p1022ds/spl.c
index b9dbf81b3f..7f151e38cf 100644
--- a/board/freescale/p1022ds/spl.c
+++ b/board/freescale/p1022ds/spl.c
@@ -102,7 +102,11 @@ void board_init_r(gd_t *gd, ulong dest_addr)
env_relocate();
#endif
- i2c_init(CONFIG_SYS_FSL_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#ifdef CONFIG_SYS_I2C
+ i2c_init_all();
+#else
+ i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#endif
gd->ram_size = initdram(0);
#ifdef CONFIG_SPL_NAND_BOOT