projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-i2c
[platform/kernel/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc8xx
/
video.c
diff --git
a/arch/powerpc/cpu/mpc8xx/video.c
b/arch/powerpc/cpu/mpc8xx/video.c
index
8d790b4
..
02cd0de
100644
(file)
--- a/
arch/powerpc/cpu/mpc8xx/video.c
+++ b/
arch/powerpc/cpu/mpc8xx/video.c
@@
-793,7
+793,11
@@
static void video_encoder_init (void)
/* Initialize the I2C */
debug ("[VIDEO ENCODER] Initializing I2C bus...\n");
+#ifdef CONFIG_SYS_I2C
+ i2c_init_all();
+#else
i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#endif
#ifdef CONFIG_FADS
/* Reset ADV7176 chip */