]> git.sur5r.net Git - u-boot/commitdiff
i2c: add i2c deblock sequence before and after every mux config
authorStefan Bigler <stefan.bigler@keymile.com>
Fri, 8 Apr 2011 14:24:08 +0000 (16:24 +0200)
committerHeiko Schocher <hs@denx.de>
Thu, 28 Apr 2011 08:56:54 +0000 (10:56 +0200)
To make sure that the mux can be configured a deblocking sequence
is done before the mux configuration. After the mux switch the new leaf
of, the i2c tree must be again deblocked.

Signed-off-by: Stefan Bigler <stefan.bigler@keymile.com>
Acked-by: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
cc: Detlev Zundel <dzu@denx.de>
cc: Prafulla Wadaskar <prafulla@marvell.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
common/cmd_i2c.c
include/i2c.h

index c272b0dd4f7dda1782c2abe8b24cff299e0f99ee..d913e13665b41728fbbd953c17db5c7ae0ac1026 100644 (file)
@@ -132,6 +132,14 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #define DISP_LINE_LEN  16
 
+/* implement possible board specific board init */
+void __def_i2c_init_board(void)
+{
+       return;
+}
+void i2c_init_board(void)
+       __attribute__((weak, alias("__def_i2c_init_board")));
+
 /* TODO: Implement architecture-specific get/set functions */
 unsigned int __def_i2c_get_bus_speed(void)
 {
@@ -1541,6 +1549,8 @@ int i2x_mux_select_mux(int bus)
 
        mux = dev->mux;
        while (mux != NULL) {
+               /* do deblocking on each level of mux, before mux config */
+               i2c_init_board();
                if (i2c_write(mux->chip, 0, 0, &mux->channel, 1) != 0) {
                        printf ("Error setting Mux: chip:%x channel: \
                                %x\n", mux->chip, mux->channel);
@@ -1548,6 +1558,8 @@ int i2x_mux_select_mux(int bus)
                }
                mux = mux->next;
        }
+       /* do deblocking on each level of mux and after mux config */
+       i2c_init_board();
        return 0;
 }
 #endif /* CONFIG_I2C_MUX */
index cd23c8ac124cd38075d0330ad4a6a212a4bbcd49..8ceb4c852149425c91377dc2a8d56e2bfd7c6c5a 100644 (file)
  * repeatedly to change the speed and slave addresses.
  */
 void i2c_init(int speed, int slaveaddr);
-#ifdef CONFIG_SYS_I2C_INIT_BOARD
 void i2c_init_board(void);
-#endif
 #ifdef CONFIG_SYS_I2C_BOARD_LATE_INIT
 void i2c_board_late_init(void);
 #endif