sf: winbond: Add W25Q64W

[u-boot] / drivers / mtd / spi / eeprom_m95xxx.c

diff --git a/drivers/mtd/spi/eeprom_m95xxx.c b/drivers/mtd/spi/eeprom_m95xxx.c
index 59f80e39ff22e3d97415c7f915a7022e8fcb689e..88b6c343498375a2e9a28cb3864c41bc76c87c95 100644 (file)
--- a/drivers/mtd/spi/eeprom_m95xxx.c
+++ b/drivers/mtd/spi/eeprom_m95xxx.c
@@ -37,30 +37,37 @@
 #define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
 #endif
 
-ssize_t spi_read (uchar *addr, int alen, uchar *buffer, int len)
+#ifndef CONFIG_SYS_SPI_WRITE_TOUT
+#define CONFIG_SYS_SPI_WRITE_TOUT (5 * CONFIG_SYS_HZ)
+#endif
+
+ssize_t spi_read(uchar *addr, int alen, uchar *buffer, int len)
 {
        struct spi_slave *slave;
        u8 cmd = SPI_EEPROM_READ;
 
        slave = spi_setup_slave(CONFIG_DEFAULT_SPI_BUS, 1, 1000000,
                        CONFIG_DEFAULT_SPI_MODE);
+       if (!slave)
+               return 0;
+
        spi_claim_bus(slave);
 
        /* command */
-       if(spi_xfer(slave, 8, &cmd, NULL, SPI_XFER_BEGIN))
+       if (spi_xfer(slave, 8, &cmd, NULL, SPI_XFER_BEGIN))
                return -1;
 
        /*
-        * if alen == 3, addr[0] is the block number, we never use it here. All we
-        * need are the lower 16 bits
+        * if alen == 3, addr[0] is the block number, we never use it here.
+        * All we need are the lower 16 bits.
         */
        if (alen == 3)
                addr++;
 
        /* address, and data */
-       if(spi_xfer(slave, 16, addr, NULL, 0))
+       if (spi_xfer(slave, 16, addr, NULL, 0))
                return -1;
-       if(spi_xfer(slave, 8 * len, NULL, buffer, SPI_XFER_END))
+       if (spi_xfer(slave, 8 * len, NULL, buffer, SPI_XFER_END))
                return -1;
 
        spi_release_bus(slave);
@@ -68,18 +75,21 @@ ssize_t spi_read (uchar *addr, int alen, uchar *buffer, int len)
        return len;
 }
 
-ssize_t spi_write (uchar *addr, int alen, uchar *buffer, int len)
+ssize_t spi_write(uchar *addr, int alen, uchar *buffer, int len)
 {
        struct spi_slave *slave;
-       int i;
        char buf[3];
+       ulong start;
 
        slave = spi_setup_slave(CONFIG_DEFAULT_SPI_BUS, 1, 1000000,
                        CONFIG_DEFAULT_SPI_MODE);
+       if (!slave)
+               return 0;
+
        spi_claim_bus(slave);
 
        buf[0] = SPI_EEPROM_WREN;
-       if(spi_xfer(slave, 8, buf, NULL, SPI_XFER_BEGIN | SPI_XFER_END))
+       if (spi_xfer(slave, 8, buf, NULL, SPI_XFER_BEGIN | SPI_XFER_END))
                return -1;
 
        buf[0] = SPI_EEPROM_WRITE;
@@ -92,12 +102,12 @@ ssize_t spi_write (uchar *addr, int alen, uchar *buffer, int len)
 
        memcpy(buf + 1, addr, alen);
        /* command + addr, then data */
-       if(spi_xfer(slave, 24, buf, NULL, SPI_XFER_BEGIN))
+       if (spi_xfer(slave, 24, buf, NULL, SPI_XFER_BEGIN))
                return -1;
-       if(spi_xfer(slave, len * 8, buffer, NULL, SPI_XFER_END))
+       if (spi_xfer(slave, len * 8, buffer, NULL, SPI_XFER_END))
                return -1;
 
-       reset_timer_masked();
+       start = get_timer(0);
        do {
                buf[0] = SPI_EEPROM_RDSR;
                buf[1] = 0;
@@ -106,10 +116,10 @@ ssize_t spi_write (uchar *addr, int alen, uchar *buffer, int len)
                if (!(buf[1] & 1))
                        break;
 
-       } while (get_timer_masked() < CONFIG_SYS_SPI_WRITE_TOUT);
+       } while (get_timer(start) < CONFIG_SYS_SPI_WRITE_TOUT);
 
        if (buf[1] & 1)
-               printf ("*** spi_write: Time out while writing!\n");
+               printf("*** spi_write: Timeout while writing!\n");
 
        spi_release_bus(slave);
        spi_free_slave(slave);