From: Wolfgang Denk <wd@pollux.denx.de>
Date: Sun, 12 Mar 2006 23:50:48 +0000 (+0100)
Subject: Change the sequence of events in soft_i2c.c:send_ack() to keep from
X-Git-Tag: LABEL_2006_04_18_1106~7^2~10
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c15f80eaefa7ece72272e6f441f0ed36eab14411;p=oweals%2Fu-boot.git

Change the sequence of events in soft_i2c.c:send_ack() to keep from
incorrectly generating start/stop conditions on the bus.
Patch by Andrew Dyer, 26 Jul 2005
---

diff --git a/CHANGELOG b/CHANGELOG
index ac984168d4..889cfd5e9e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Change the sequence of events in soft_i2c.c:send_ack() to keep from
+  incorrectly generating start/stop conditions on the bus.
+  Patch by Andrew Dyer, 26 Jul 2005
+
 * Fix bug in [id]cache_status commands for MPC85xx processors;
   should look at LSB of L1CSRn registers to determine if L1 cache is
   enabled, not the MSB.
diff --git a/common/soft_i2c.c b/common/soft_i2c.c
index 48e3d3e1c2..b3642dafc2 100644
--- a/common/soft_i2c.c
+++ b/common/soft_i2c.c
@@ -164,13 +164,10 @@ static void send_ack(int ack)
 	volatile immap_t *immr = (immap_t *)CFG_IMMR;
 #endif
 
-	I2C_ACTIVE;
 	I2C_SCL(0);
 	I2C_DELAY;
-
-	I2C_SDA(ack);
-
 	I2C_ACTIVE;
+	I2C_SDA(ack);
 	I2C_DELAY;
 	I2C_SCL(1);
 	I2C_DELAY;