pci: Do not skip legacy IDE device configuration

[oweals/u-boot.git] / drivers / spi / altera_spi.c

diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c
index 373ce30a0324e8f5f42869bdac2bf2fb8a5d4197..a4d03d97cfcff6aff2d20718f40ec83090384545 100644 (file)
--- a/drivers/spi/altera_spi.c
+++ b/drivers/spi/altera_spi.c
@@ -12,6 +12,14 @@
 #include <malloc.h>
 #include <spi.h>
 
+#ifndef CONFIG_ALTERA_SPI_IDLE_VAL
+#define CONFIG_ALTERA_SPI_IDLE_VAL 0xff
+#endif
+
+#ifndef CONFIG_SYS_ALTERA_SPI_LIST
+#define CONFIG_SYS_ALTERA_SPI_LIST { CONFIG_SYS_SPI_BASE }
+#endif
+
 struct altera_spi_regs {
        u32     rxdata;
        u32     txdata;
@@ -35,10 +43,6 @@ struct altera_spi_regs {
 #define ALTERA_SPI_CONTROL_IE_MSK      (1 << 8)
 #define ALTERA_SPI_CONTROL_SSO_MSK     (1 << 10)
 
-#ifndef CONFIG_SYS_ALTERA_SPI_LIST
-#define CONFIG_SYS_ALTERA_SPI_LIST { CONFIG_SYS_SPI_BASE }
-#endif
-
 static ulong altera_spi_base_list[] = CONFIG_SYS_ALTERA_SPI_LIST;
 
 struct altera_spi_slave {
@@ -117,18 +121,15 @@ void spi_release_bus(struct spi_slave *slave)
        writel(0, &altspi->regs->slave_sel);
 }
 
-#ifndef CONFIG_ALTERA_SPI_IDLE_VAL
-# define CONFIG_ALTERA_SPI_IDLE_VAL 0xff
-#endif
-
 int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
             void *din, unsigned long flags)
 {
        struct altera_spi_slave *altspi = to_altera_spi_slave(slave);
        /* assume spi core configured to do 8 bit transfers */
-       uint bytes = bitlen / 8;
-       const uchar *txp = dout;
-       uchar *rxp = din;
+       unsigned int bytes = bitlen / 8;
+       const unsigned char *txp = dout;
+       unsigned char *rxp = din;
+       uint32_t reg, data, start;
 
        debug("%s: bus:%i cs:%i bitlen:%i bytes:%i flags:%lx\n", __func__,
              slave->bus, slave->cs, bitlen, bytes, flags);
@@ -149,19 +150,30 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
                spi_cs_activate(slave);
 
        while (bytes--) {
-               uchar d = txp ? *txp++ : CONFIG_ALTERA_SPI_IDLE_VAL;
-
-               debug("%s: tx:%x ", __func__, d);
-               writel(d, &altspi->regs->txdata);
-
-               while (!(readl(&altspi->regs->status) & ALTERA_SPI_STATUS_RRDY_MSK))
-                       ;
-
-               d = readl(&altspi->regs->rxdata);
+               if (txp)
+                       data = *txp++;
+               else
+                       data = CONFIG_ALTERA_SPI_IDLE_VAL;
+
+               debug("%s: tx:%x ", __func__, data);
+               writel(data, &altspi->regs->txdata);
+
+               start = get_timer(0);
+               while (1) {
+                       reg = readl(&altspi->regs->status);
+                       if (reg & ALTERA_SPI_STATUS_RRDY_MSK)
+                               break;
+                       if (get_timer(start) > (CONFIG_SYS_HZ / 1000)) {
+                               printf("%s: Transmission timed out!\n", __func__);
+                               goto done;
+                       }
+               }
+
+               data = readl(&altspi->regs->rxdata);
                if (rxp)
-                       *rxp++ = d;
+                       *rxp++ = data & 0xff;
 
-               debug("rx:%x\n", d);
+               debug("rx:%x\n", data);
        }
 
 done: