Merge branch 'master' of git://git.denx.de/u-boot-video

[karo-tx-uboot.git] / drivers / spi / bfin_spi.c

diff --git a/drivers/spi/bfin_spi.c b/drivers/spi/bfin_spi.c
index 556b97a64dada50370298118809097e6ce764afa..a9a4d92c3e719b0a1f215393ac7fc22de6cae8cf 100644 (file)
--- a/drivers/spi/bfin_spi.c
+++ b/drivers/spi/bfin_spi.c
@@ -1,7 +1,7 @@
 /*
  * Driver for Blackfin On-Chip SPI device
  *
- * Copyright (c) 2005-2008 Analog Devices Inc.
+ * Copyright (c) 2005-2010 Analog Devices Inc.
  *
  * Licensed under the GPL-2 or later.
  */
@@ -137,13 +137,29 @@ static const unsigned short cs_pins[][7] = {
 #endif
 };
 
+void spi_set_speed(struct spi_slave *slave, uint hz)
+{
+       struct bfin_spi_slave *bss = to_bfin_spi_slave(slave);
+       ulong sclk;
+       u32 baud;
+
+       sclk = get_sclk();
+       baud = sclk / (2 * hz);
+       /* baud should be rounded up */
+       if (sclk % (2 * hz))
+               baud += 1;
+       if (baud < 2)
+               baud = 2;
+       else if (baud > (u16)-1)
+               baud = -1;
+       bss->baud = baud;
+}
+
 struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
                unsigned int max_hz, unsigned int mode)
 {
        struct bfin_spi_slave *bss;
-       ulong sclk;
        u32 mmr_base;
-       u32 baud;
 
        if (!spi_cs_is_valid(bus, cs))
                return NULL;
@@ -165,32 +181,20 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
                default: return NULL;
        }
 
-       sclk = get_sclk();
-       baud = sclk / (2 * max_hz);
-       /* baud should be rounded up */
-       if (sclk % (2 * max_hz))
-               baud += 1;
-       if (baud < 2)
-               baud = 2;
-       else if (baud > (u16)-1)
-               baud = -1;
-
-       bss = malloc(sizeof(*bss));
+       bss = spi_alloc_slave(struct bfin_spi_slave, bus, cs);
        if (!bss)
                return NULL;
 
-       bss->slave.bus = bus;
-       bss->slave.cs = cs;
        bss->mmr_base = (void *)mmr_base;
        bss->ctl = SPE | MSTR | TDBR_CORE;
        if (mode & SPI_CPHA) bss->ctl |= CPHA;
        if (mode & SPI_CPOL) bss->ctl |= CPOL;
        if (mode & SPI_LSB_FIRST) bss->ctl |= LSBF;
-       bss->baud = baud;
        bss->flg = mode & SPI_CS_HIGH ? 1 : 0;
+       spi_set_speed(&bss->slave, max_hz);
 
        debug("%s: bus:%i cs:%i mmr:%x ctl:%x baud:%i flg:%i\n", __func__,
-               bus, cs, mmr_base, bss->ctl, baud, bss->flg);
+               bus, cs, mmr_base, bss->ctl, bss->baud, bss->flg);
 
        return &bss->slave;
 }
@@ -241,6 +245,35 @@ void spi_release_bus(struct spi_slave *slave)
 # define CONFIG_BFIN_SPI_IDLE_VAL 0xff
 #endif
 
+static int spi_pio_xfer(struct bfin_spi_slave *bss, const u8 *tx, u8 *rx,
+                       uint bytes)
+{
+       /* discard invalid data and clear RXS */
+       read_SPI_RDBR(bss);
+       /* todo: take advantage of hardware fifos  */
+       while (bytes--) {
+               u8 value = (tx ? *tx++ : CONFIG_BFIN_SPI_IDLE_VAL);
+               debug("%s: tx:%x ", __func__, value);
+               write_SPI_TDBR(bss, value);
+               SSYNC();
+               while ((read_SPI_STAT(bss) & TXS))
+                       if (ctrlc())
+                               return -1;
+               while (!(read_SPI_STAT(bss) & SPIF))
+                       if (ctrlc())
+                               return -1;
+               while (!(read_SPI_STAT(bss) & RXS))
+                       if (ctrlc())
+                               return -1;
+               value = read_SPI_RDBR(bss);
+               if (rx)
+                       *rx++ = value;
+               debug("rx:%x\n", value);
+       }
+
+       return 0;
+}
+
 int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
                void *din, unsigned long flags)
 {
@@ -265,32 +298,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
        if (flags & SPI_XFER_BEGIN)
                spi_cs_activate(slave);
 
-       /* todo: take advantage of hardware fifos and setup RX dma */
-       while (bytes--) {
-               u8 value = (tx ? *tx++ : CONFIG_BFIN_SPI_IDLE_VAL);
-               debug("%s: tx:%x ", __func__, value);
-               write_SPI_TDBR(bss, value);
-               SSYNC();
-               while ((read_SPI_STAT(bss) & TXS))
-                       if (ctrlc()) {
-                               ret = -1;
-                               goto done;
-                       }
-               while (!(read_SPI_STAT(bss) & SPIF))
-                       if (ctrlc()) {
-                               ret = -1;
-                               goto done;
-                       }
-               while (!(read_SPI_STAT(bss) & RXS))
-                       if (ctrlc()) {
-                               ret = -1;
-                               goto done;
-                       }
-               value = read_SPI_RDBR(bss);
-               if (rx)
-                       *rx++ = value;
-               debug("rx:%x\n", value);
-       }
+       ret = spi_pio_xfer(bss, tx, rx, bytes);
 
  done:
        if (flags & SPI_XFER_END)