Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[people/ms/u-boot.git] / drivers / spi / mpc8xxx_spi.c

diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index 2fe838c45d59f441b355ed10eb4ff5a357c89aff..6b0e3b46ec8fead7db89daf64e67422dc9fe50bd 100644 (file)
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2006 Ben Warren, Qstreams Networks Inc.
- * With help from the common/soft_spi and cpu/mpc8260 drivers
+ * With help from the common/soft_spi and arch/powerpc/cpu/mpc8260 drivers
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -22,8 +22,8 @@
  */
 
 #include <common.h>
-#if defined(CONFIG_MPC8XXX_SPI) && defined(CONFIG_HARD_SPI)
 
+#include <malloc.h>
 #include <spi.h>
 #include <asm/mpc8xxx_spi.h>
 
@@ -37,9 +37,34 @@
 
 #define SPI_TIMEOUT    1000
 
+struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
+               unsigned int max_hz, unsigned int mode)
+{
+       struct spi_slave *slave;
+
+       if (!spi_cs_is_valid(bus, cs))
+               return NULL;
+
+       slave = spi_alloc_slave_base(bus, cs);
+       if (!slave)
+               return NULL;
+
+       /*
+        * TODO: Some of the code in spi_init() should probably move
+        * here, or into spi_claim_bus() below.
+        */
+
+       return slave;
+}
+
+void spi_free_slave(struct spi_slave *slave)
+{
+       free(slave);
+}
+
 void spi_init(void)
 {
-       volatile spi8xxx_t *spi = &((immap_t *) (CFG_IMMR))->spi;
+       volatile spi8xxx_t *spi = &((immap_t *) (CONFIG_SYS_IMMR))->spi;
 
        /*
         * SPI pins on the MPC83xx are not muxed, so all we do is initialize
@@ -53,19 +78,30 @@ void spi_init(void)
        spi->com = 0;           /* LST bit doesn't do anything, so disregard */
 }
 
-int spi_xfer(spi_chipsel_type chipsel, int bitlen, uchar *dout, uchar *din)
+int spi_claim_bus(struct spi_slave *slave)
+{
+       return 0;
+}
+
+void spi_release_bus(struct spi_slave *slave)
 {
-       volatile spi8xxx_t *spi = &((immap_t *) (CFG_IMMR))->spi;
+
+}
+
+int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
+               void *din, unsigned long flags)
+{
+       volatile spi8xxx_t *spi = &((immap_t *) (CONFIG_SYS_IMMR))->spi;
        unsigned int tmpdout, tmpdin, event;
        int numBlks = bitlen / 32 + (bitlen % 32 ? 1 : 0);
        int tm, isRead = 0;
        unsigned char charSize = 32;
 
-       debug("spi_xfer: chipsel %08X dout %08X din %08X bitlen %d\n",
-             (int)chipsel, *(uint *) dout, *(uint *) din, bitlen);
+       debug("spi_xfer: slave %u:%u dout %08X din %08X bitlen %u\n",
+             slave->bus, slave->cs, *(uint *) dout, *(uint *) din, bitlen);
 
-       if (chipsel != NULL)
-               (*chipsel) (1); /* select the target chip */
+       if (flags & SPI_XFER_BEGIN)
+               spi_cs_activate(slave);
 
        spi->event = 0xffffffff;        /* Clear all SPI events */
 
@@ -85,6 +121,8 @@ int spi_xfer(spi_chipsel_type chipsel, int bitlen, uchar *dout, uchar *din)
                 * len > 16               0
                 */
 
+               spi->mode &= ~SPI_MODE_EN;
+
                if (bitlen <= 16) {
                        if (bitlen <= 4)
                                spi->mode = (spi->mode & 0xff0fffff) |
@@ -99,6 +137,8 @@ int spi_xfer(spi_chipsel_type chipsel, int bitlen, uchar *dout, uchar *din)
                        dout += 4;
                }
 
+               spi->mode |= SPI_MODE_EN;
+
                spi->tx = tmpdout;      /* Write the data out */
                debug("*** spi_xfer: ... %08x written\n", tmpdout);
 
@@ -135,9 +175,8 @@ int spi_xfer(spi_chipsel_type chipsel, int bitlen, uchar *dout, uchar *din)
                debug("*** spi_xfer: transfer ended. Value=%08x\n", tmpdin);
        }
 
-       if (chipsel != NULL)
-               (*chipsel) (0); /* deselect the target chip */
+       if (flags & SPI_XFER_END)
+               spi_cs_deactivate(slave);
 
        return 0;
 }
-#endif                         /* CONFIG_HARD_SPI */