Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

[u-boot] / common / soft_i2c.c

diff --git a/common/soft_i2c.c b/common/soft_i2c.c
index bffcd4405ec5bbe5d550ec471f6e5f4657bd33fa..5ef7f303b8435d52a5ccb8151d316b8e79141ada 100644 (file)
--- a/common/soft_i2c.c
+++ b/common/soft_i2c.c
@@ -29,10 +29,16 @@
 #ifdef CONFIG_MPC8260                  /* only valid for MPC8260 */
 #include <ioports.h>
 #endif
-#ifdef CONFIG_AT91RM9200DK             /* need this for the at91rm9200dk */
+#ifdef CONFIG_AT91RM9200               /* need this for the at91rm9200 */
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #endif
+#ifdef CONFIG_IXP425                   /* only valid for IXP425 */
+#include <asm/arch/ixp425.h>
+#endif
+#ifdef CONFIG_LPC2292
+#include <asm/arch/hardware.h>
+#endif
 #include <i2c.h>
 
 #if defined(CONFIG_SOFT_I2C)
@@ -246,6 +252,7 @@ static uchar read_byte(int ack)
         * Read 8 bits, MSB first.
         */
        I2C_TRISTATE;
+       I2C_SDA(1);
        data = 0;
        for(j = 0; j < 8; j++) {
                I2C_SCL(0);