Patches by Murray Jensen, 17 Jun 2003:

[people/ms/u-boot.git] / common / cmd_eeprom.c

diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index 29e9faf2b23948953e8f5d56cbab251d7691be40..3db0bca69dab8ff7744f144e59bf4415bb71d363 100644 (file)
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -288,7 +288,7 @@ int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cn
                         */
                        contr_reg[0] = 0;
                        for (i = 0; i < MAX_ACKNOWLEDGE_POLLS; i++) {
-                               if (i2c_read (addr_void[0], addr_void[1], 1, contr_reg, 1) == 1)
+                               if (i2c_read (addr_void[0], addr_void[1], 1, contr_reg, 1) == 0)
                                        break;  /* got ack */
 #if defined(CFG_EEPROM_PAGE_WRITE_DELAY_MS)
                                udelay(CFG_EEPROM_PAGE_WRITE_DELAY_MS * 1000);
@@ -327,6 +327,26 @@ int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cn
        return rcode;
 }
 
+#ifndef CONFIG_SPI
+int
+eeprom_probe (unsigned dev_addr, unsigned offset)
+{
+       unsigned char chip;
+
+       /* Probe the chip address
+        */
+#if CFG_I2C_EEPROM_ADDR_LEN == 1 && !defined(CONFIG_SPI_X)
+       chip = offset >> 8;             /* block number */
+#else
+       chip = offset >> 16;            /* block number */
+#endif /* CFG_I2C_EEPROM_ADDR_LEN, CONFIG_SPI_X */
+
+       chip |= dev_addr;               /* insert device address */
+
+       return (i2c_probe (chip));
+}
+#endif
+
 /*-----------------------------------------------------------------------
  * Set default values
  */