spi: fsl_qspi: Fix qspi_op_rdid memcpy issue

[J-u-boot.git] / drivers / spi / bfin_spi.c

diff --git a/drivers/spi/bfin_spi.c b/drivers/spi/bfin_spi.c
index 0472c1a72fa29b6a02f18f6b07f329b0ee7b88e4..9a6fc781515ac9016c7c791712395ae8d2396a95 100644 (file)
--- a/drivers/spi/bfin_spi.c
+++ b/drivers/spi/bfin_spi.c
@@ -1,18 +1,22 @@
 /*
  * Driver for Blackfin On-Chip SPI device
  *
 /*
  * 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.
+ * SPDX-License-Identifier:    GPL-2.0+

  */
 
 /*#define DEBUG*/
 
 #include <common.h>
  */
 
 /*#define DEBUG*/
 
 #include <common.h>

+#include <console.h>

 #include <malloc.h>
 #include <spi.h>
 
 #include <asm/blackfin.h>
 #include <malloc.h>
 #include <spi.h>
 
 #include <asm/blackfin.h>

+#include <asm/clock.h>
+#include <asm/gpio.h>
+#include <asm/portmux.h>

 #include <asm/mach-common/bits/spi.h>
 
 struct bfin_spi_slave {
 #include <asm/mach-common/bits/spi.h>
 
 struct bfin_spi_slave {


@@ -33,81 +37,165 @@ MAKE_SPI_FUNC(SPI_BAUD, 0x14)
 
 #define to_bfin_spi_slave(s) container_of(s, struct bfin_spi_slave, slave)
 
 
 #define to_bfin_spi_slave(s) container_of(s, struct bfin_spi_slave, slave)
 

-__attribute__((weak))
+#define gpio_cs(cs) ((cs) - MAX_CTRL_CS)
+#ifdef CONFIG_BFIN_SPI_GPIO_CS
+# define is_gpio_cs(cs) ((cs) > MAX_CTRL_CS)
+#else
+# define is_gpio_cs(cs) 0
+#endif
+

 int spi_cs_is_valid(unsigned int bus, unsigned int cs)
 {
 int spi_cs_is_valid(unsigned int bus, unsigned int cs)
 {

-       return (cs >= 1 && cs <= 7);
+       if (is_gpio_cs(cs))
+               return gpio_is_valid(gpio_cs(cs));
+       else
+               return (cs >= 1 && cs <= MAX_CTRL_CS);

 }
 
 }
 

-__attribute__((weak))

 void spi_cs_activate(struct spi_slave *slave)
 {
        struct bfin_spi_slave *bss = to_bfin_spi_slave(slave);
 void spi_cs_activate(struct spi_slave *slave)
 {
        struct bfin_spi_slave *bss = to_bfin_spi_slave(slave);

-       write_SPI_FLG(bss,
-               (read_SPI_FLG(bss) &
-               ~((!bss->flg << 8) << slave->cs)) |
-               (1 << slave->cs));
-       debug("%s: SPI_FLG:%x\n", __func__, read_SPI_FLG(bss));
+
+       if (is_gpio_cs(slave->cs)) {
+               unsigned int cs = gpio_cs(slave->cs);
+               gpio_set_value(cs, bss->flg);
+               debug("%s: SPI_CS_GPIO:%x\n", __func__, gpio_get_value(cs));
+       } else {
+               write_SPI_FLG(bss,
+                       (read_SPI_FLG(bss) &
+                       ~((!bss->flg << 8) << slave->cs)) |
+                       (1 << slave->cs));
+               debug("%s: SPI_FLG:%x\n", __func__, read_SPI_FLG(bss));
+       }
+
+       SSYNC();

 }
 
 }
 

-__attribute__((weak))

 void spi_cs_deactivate(struct spi_slave *slave)
 {
        struct bfin_spi_slave *bss = to_bfin_spi_slave(slave);
 void spi_cs_deactivate(struct spi_slave *slave)
 {
        struct bfin_spi_slave *bss = to_bfin_spi_slave(slave);

-       write_SPI_FLG(bss, read_SPI_FLG(bss) & ~(1 << slave->cs));
-       debug("%s: SPI_FLG:%x\n", __func__, read_SPI_FLG(bss));
+
+       if (is_gpio_cs(slave->cs)) {
+               unsigned int cs = gpio_cs(slave->cs);
+               gpio_set_value(cs, !bss->flg);
+               debug("%s: SPI_CS_GPIO:%x\n", __func__, gpio_get_value(cs));
+       } else {
+               u16 flg;
+
+               /* make sure we force the cs to deassert rather than let the
+                * pin float back up.  otherwise, exact timings may not be
+                * met some of the time leading to random behavior (ugh).
+                */
+               flg = read_SPI_FLG(bss) | ((!bss->flg << 8) << slave->cs);
+               write_SPI_FLG(bss, flg);
+               SSYNC();
+               debug("%s: SPI_FLG:%x\n", __func__, read_SPI_FLG(bss));
+
+               flg &= ~(1 << slave->cs);
+               write_SPI_FLG(bss, flg);
+               debug("%s: SPI_FLG:%x\n", __func__, read_SPI_FLG(bss));
+       }
+
+       SSYNC();

 }
 
 void spi_init()
 {
 }
 
 }
 
 void spi_init()
 {
 }
 

+#ifdef SPI_CTL
+# define SPI0_CTL SPI_CTL
+#endif
+
+#define SPI_PINS(n) \
+       [n] = { 0, P_SPI##n##_SCK, P_SPI##n##_MISO, P_SPI##n##_MOSI, 0 }
+static unsigned short pins[][5] = {
+#ifdef SPI0_CTL
+       SPI_PINS(0),
+#endif
+#ifdef SPI1_CTL
+       SPI_PINS(1),
+#endif
+#ifdef SPI2_CTL
+       SPI_PINS(2),
+#endif
+};
+
+#define SPI_CS_PINS(n) \
+       [n] = { \
+               P_SPI##n##_SSEL1, P_SPI##n##_SSEL2, P_SPI##n##_SSEL3, \
+               P_SPI##n##_SSEL4, P_SPI##n##_SSEL5, P_SPI##n##_SSEL6, \
+               P_SPI##n##_SSEL7, \
+       }
+static const unsigned short cs_pins[][7] = {
+#ifdef SPI0_CTL
+       SPI_CS_PINS(0),
+#endif
+#ifdef SPI1_CTL
+       SPI_CS_PINS(1),
+#endif
+#ifdef SPI2_CTL
+       SPI_CS_PINS(2),
+#endif
+};
+
+void spi_set_speed(struct spi_slave *slave, uint hz)
+{
+       struct bfin_spi_slave *bss = to_bfin_spi_slave(slave);
+       ulong clk;
+       u32 baud;
+
+       clk = get_spi_clk();
+       /* baud should be rounded up */
+       baud = DIV_ROUND_UP(clk, 2 * hz);
+       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;
        u32 mmr_base;
 struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
                unsigned int max_hz, unsigned int mode)
 {
        struct bfin_spi_slave *bss;
        u32 mmr_base;

-       u32 baud;

 
        if (!spi_cs_is_valid(bus, cs))
                return NULL;
 
        switch (bus) {
 
        if (!spi_cs_is_valid(bus, cs))
                return NULL;
 
        switch (bus) {

-#ifdef SPI_CTL
-# define SPI0_CTL SPI_CTL
+#ifdef SPI0_CTL
+       case 0:
+               mmr_base = SPI0_CTL; break;

 #endif
 #endif

-               case 0: mmr_base = SPI0_CTL; break;

 #ifdef SPI1_CTL
 #ifdef SPI1_CTL

-               case 1: mmr_base = SPI1_CTL; break;
+       case 1:
+               mmr_base = SPI1_CTL; break;

 #endif
 #ifdef SPI2_CTL
 #endif
 #ifdef SPI2_CTL

-               case 2: mmr_base = SPI2_CTL; break;
+       case 2:
+               mmr_base = SPI2_CTL; break;

 #endif
 #endif

-               default: return NULL;
+       default:
+               debug("%s: invalid bus %u\n", __func__, bus);
+               return NULL;

        }
 
        }
 

-       baud = get_sclk() / (2 * max_hz);
-       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;
 
        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->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;
        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__,
 
        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;
 }
 
        return &bss->slave;
 }


@@ -118,155 +206,21 @@ void spi_free_slave(struct spi_slave *slave)
        free(bss);
 }
 
        free(bss);
 }
 

-static void spi_portmux(struct spi_slave *slave)
-{
-#if defined(__ADSPBF51x__)
-#define SET_MUX(port, mux, func) port##_mux = ((port##_mux & ~PORT_x_MUX_##mux##_MASK) | PORT_x_MUX_##mux##_FUNC_##func)
-       u16 f_mux = bfin_read_PORTF_MUX();
-       u16 f_fer = bfin_read_PORTF_FER();
-       u16 g_mux = bfin_read_PORTG_MUX();
-       u16 g_fer = bfin_read_PORTG_FER();
-       u16 h_mux = bfin_read_PORTH_MUX();
-       u16 h_fer = bfin_read_PORTH_FER();
-       switch (slave->bus) {
-       case 0:
-               /* set SCK/MISO/MOSI */
-               SET_MUX(g, 7, 1);
-               g_fer |= PG12 | PG13 | PG14;
-               switch (slave->cs) {
-                       case 1: SET_MUX(f, 2, 1); f_fer |= PF7;  break;
-                       case 2: /* see G above */ g_fer |= PG15; break;
-                       case 3: SET_MUX(h, 1, 3); f_fer |= PH4;  break;
-                       case 4: /* no muxing */                  break;
-                       case 5: SET_MUX(g, 1, 3); h_fer |= PG3;  break;
-                       case 6: /* no muxing */                  break;
-                       case 7: /* no muxing */                  break;
-               }
-       case 1:
-               /* set SCK/MISO/MOSI */
-               SET_MUX(h, 0, 2);
-               h_fer |= PH1 | PH2 | PH3;
-               switch (slave->cs) {
-                       case 1: SET_MUX(h, 2, 3); h_fer |= PH6;  break;
-                       case 2: SET_MUX(f, 0, 3); f_fer |= PF0;  break;
-                       case 3: SET_MUX(g, 0, 3); g_fer |= PG0;  break;
-                       case 4: SET_MUX(f, 3, 3); f_fer |= PF8;  break;
-                       case 5: SET_MUX(g, 6, 3); h_fer |= PG11; break;
-                       case 6: /* no muxing */                  break;
-                       case 7: /* no muxing */                  break;
-               }
-       }
-       bfin_write_PORTF_MUX(f_mux);
-       bfin_write_PORTF_FER(f_fer);
-       bfin_write_PORTG_MUX(g_mux);
-       bfin_write_PORTG_FER(g_fer);
-       bfin_write_PORTH_MUX(h_mux);
-       bfin_write_PORTH_FER(h_fer);
-#elif defined(__ADSPBF52x__)
-#define SET_MUX(port, mux, func) port##_mux = ((port##_mux & ~PORT_x_MUX_##mux##_MASK) | PORT_x_MUX_##mux##_FUNC_##func)
-       u16 f_mux = bfin_read_PORTF_MUX();
-       u16 f_fer = bfin_read_PORTF_FER();
-       u16 g_mux = bfin_read_PORTG_MUX();
-       u16 g_fer = bfin_read_PORTG_FER();
-       u16 h_mux = bfin_read_PORTH_MUX();
-       u16 h_fer = bfin_read_PORTH_FER();
-       /* set SCK/MISO/MOSI */
-       SET_MUX(g, 0, 3);
-       g_fer |= PG2 | PG3 | PG4;
-       switch (slave->cs) {
-               case 1: /* see G above */ g_fer |= PG1;  break;
-               case 2: SET_MUX(f, 4, 3); f_fer |= PF12; break;
-               case 3: SET_MUX(f, 4, 3); f_fer |= PF13; break;
-               case 4: SET_MUX(h, 1, 1); h_fer |= PH8;  break;
-               case 5: SET_MUX(h, 2, 1); h_fer |= PH9;  break;
-               case 6: SET_MUX(f, 1, 3); f_fer |= PF9;  break;
-               case 7: SET_MUX(f, 2, 3); f_fer |= PF10; break;
-       }
-       bfin_write_PORTF_MUX(f_mux);
-       bfin_write_PORTF_FER(f_fer);
-       bfin_write_PORTG_MUX(g_mux);
-       bfin_write_PORTG_FER(g_fer);
-       bfin_write_PORTH_MUX(h_mux);
-       bfin_write_PORTH_FER(h_fer);
-#elif defined(__ADSPBF534__) || defined(__ADSPBF536__) || defined(__ADSPBF537__)
-       u16 mux = bfin_read_PORT_MUX();
-       u16 f_fer = bfin_read_PORTF_FER();
-       /* set SCK/MISO/MOSI */
-       f_fer |= PF11 | PF12 | PF13;
-       switch (slave->cs) {
-               case 1: f_fer |= PF10; break;
-               case 2: mux |= PJSE; break;
-               case 3: mux |= PJSE; break;
-               case 4: mux |= PFS4E; f_fer |= PF6; break;
-               case 5: mux |= PFS5E; f_fer |= PF5; break;
-               case 6: mux |= PFS6E; f_fer |= PF4; break;
-               case 7: mux |= PJCE_SPI; break;
-       }
-       bfin_write_PORT_MUX(mux);
-       bfin_write_PORTF_FER(f_fer);
-#elif defined(__ADSPBF54x__)
-#define DO_MUX(port, pin) \
-       mux = ((mux & ~PORT_x_MUX_##pin##_MASK) | PORT_x_MUX_##pin##_FUNC_1); \
-       fer |= P##port##pin;
-       u32 mux;
-       u16 fer;
-       switch (slave->bus) {
-       case 0:
-               mux = bfin_read_PORTE_MUX();
-               fer = bfin_read_PORTE_FER();
-               /* set SCK/MISO/MOSI */
-               DO_MUX(E, 0);
-               DO_MUX(E, 1);
-               DO_MUX(E, 2);
-               switch (slave->cs) {
-                       case 1: DO_MUX(E, 4); break;
-                       case 2: DO_MUX(E, 5); break;
-                       case 3: DO_MUX(E, 6); break;
-               }
-               bfin_write_PORTE_MUX(mux);
-               bfin_write_PORTE_FER(fer);
-               break;
-       case 1:
-               mux = bfin_read_PORTG_MUX();
-               fer = bfin_read_PORTG_FER();
-               /* set SCK/MISO/MOSI */
-               DO_MUX(G, 8);
-               DO_MUX(G, 9);
-               DO_MUX(G, 10);
-               switch (slave->cs) {
-                       case 1: DO_MUX(G, 5); break;
-                       case 2: DO_MUX(G, 6); break;
-                       case 3: DO_MUX(G, 7); break;
-               }
-               bfin_write_PORTG_MUX(mux);
-               bfin_write_PORTG_FER(fer);
-               break;
-       case 2:
-               mux = bfin_read_PORTB_MUX();
-               fer = bfin_read_PORTB_FER();
-               /* set SCK/MISO/MOSI */
-               DO_MUX(B, 12);
-               DO_MUX(B, 13);
-               DO_MUX(B, 14);
-               switch (slave->cs) {
-                       case 1: DO_MUX(B, 9);  break;
-                       case 2: DO_MUX(B, 10); break;
-                       case 3: DO_MUX(B, 11); break;
-               }
-               bfin_write_PORTB_MUX(mux);
-               bfin_write_PORTB_FER(fer);
-               break;
-       }
-#endif
-}
-

 int spi_claim_bus(struct spi_slave *slave)
 {
        struct bfin_spi_slave *bss = to_bfin_spi_slave(slave);
 
        debug("%s: bus:%i cs:%i\n", __func__, slave->bus, slave->cs);
 
 int spi_claim_bus(struct spi_slave *slave)
 {
        struct bfin_spi_slave *bss = to_bfin_spi_slave(slave);
 
        debug("%s: bus:%i cs:%i\n", __func__, slave->bus, slave->cs);
 

-       spi_portmux(slave);
+       if (is_gpio_cs(slave->cs)) {
+               unsigned int cs = gpio_cs(slave->cs);
+               gpio_request(cs, "bfin-spi");
+               gpio_direction_output(cs, !bss->flg);
+               pins[slave->bus][0] = P_DONTCARE;
+       } else
+               pins[slave->bus][0] = cs_pins[slave->bus][slave->cs - 1];
+       peripheral_request_list(pins[slave->bus], "bfin-spi");
+

        write_SPI_CTL(bss, bss->ctl);
        write_SPI_BAUD(bss, bss->baud);
        SSYNC();
        write_SPI_CTL(bss, bss->ctl);
        write_SPI_BAUD(bss, bss->baud);
        SSYNC();


@@ -277,11 +231,50 @@ int spi_claim_bus(struct spi_slave *slave)
 void spi_release_bus(struct spi_slave *slave)
 {
        struct bfin_spi_slave *bss = to_bfin_spi_slave(slave);
 void spi_release_bus(struct spi_slave *slave)
 {
        struct bfin_spi_slave *bss = to_bfin_spi_slave(slave);

+

        debug("%s: bus:%i cs:%i\n", __func__, slave->bus, slave->cs);
        debug("%s: bus:%i cs:%i\n", __func__, slave->bus, slave->cs);

+
+       peripheral_free_list(pins[slave->bus]);
+       if (is_gpio_cs(slave->cs))
+               gpio_free(gpio_cs(slave->cs));
+

        write_SPI_CTL(bss, 0);
        SSYNC();
 }
 
        write_SPI_CTL(bss, 0);
        SSYNC();
 }
 

+#ifndef CONFIG_BFIN_SPI_IDLE_VAL
+# 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)
 {
 int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
                void *din, unsigned long flags)
 {


@@ -306,32 +299,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
        if (flags & SPI_XFER_BEGIN)
                spi_cs_activate(slave);
 
        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++ : 0);
-               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)
 
  done:
        if (flags & SPI_XFER_END)