EfikaMX: Enable EXT2 booting

[u-boot] / drivers / spi / atmel_spi.c

diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 317c0b41b6fbc6636303ef3a4196a63f16fa05bc..33e38b61b72501a8d5935741e8894d923b2cb797 100644 (file)
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -26,7 +26,7 @@
 #include <asm/io.h>
 
 #include <asm/arch/clk.h>
-#include <asm/arch/memory-map.h>
+#include <asm/arch/hardware.h>
 
 #include "atmel_spi.h"
 
@@ -43,26 +43,26 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
        u32                     csrx;
        void                    *regs;
 
-       if (cs > 3 || !spi_cs_is_valid(bus, cs))
+       if (!spi_cs_is_valid(bus, cs))
                return NULL;
 
        switch (bus) {
        case 0:
-               regs = (void *)SPI0_BASE;
+               regs = (void *)ATMEL_BASE_SPI0;
                break;
-#ifdef SPI1_BASE
+#ifdef ATMEL_BASE_SPI1
        case 1:
-               regs = (void *)SPI1_BASE;
+               regs = (void *)ATMEL_BASE_SPI1;
                break;
 #endif
-#ifdef SPI2_BASE
+#ifdef ATMEL_BASE_SPI2
        case 2:
-               regs = (void *)SPI2_BASE;
+               regs = (void *)ATMEL_BASE_SPI2;
                break;
 #endif
-#ifdef SPI3_BASE
+#ifdef ATMEL_BASE_SPI3
        case 3:
-               regs = (void *)SPI3_BASE;
+               regs = (void *)ATMEL_BASE_SPI3;
                break;
 #endif
        default:
@@ -168,8 +168,17 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen,
         * somewhat quirky, and it doesn't really buy us much anyway
         * in the context of U-Boot.
         */
-       if (flags & SPI_XFER_BEGIN)
+       if (flags & SPI_XFER_BEGIN) {
                spi_cs_activate(slave);
+               /*
+                * sometimes the RDR is not empty when we get here,
+                * in theory that should not happen, but it DOES happen.
+                * Read it here to be on the safe side.
+                * That also clears the OVRES flag. Required if the
+                * following loop exits due to OVRES!
+                */
+               spi_readl(as, RDR);
+       }
 
        for (len_tx = 0, len_rx = 0; len_rx < len; ) {
                status = spi_readl(as, SR);