sunxi: video: Add lvds support

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

diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c
index 13191f34a9dc6c4315766af65c72710e9a055412..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;
@@ -21,23 +29,19 @@ struct altera_spi_regs {
        u32     slave_sel;
 };
 
-#define ALTERA_SPI_STATUS_ROE_MSK      (0x8)
-#define ALTERA_SPI_STATUS_TOE_MSK      (0x10)
-#define ALTERA_SPI_STATUS_TMT_MSK      (0x20)
-#define ALTERA_SPI_STATUS_TRDY_MSK     (0x40)
-#define ALTERA_SPI_STATUS_RRDY_MSK     (0x80)
-#define ALTERA_SPI_STATUS_E_MSK        (0x100)
+#define ALTERA_SPI_STATUS_ROE_MSK      (1 << 3)
+#define ALTERA_SPI_STATUS_TOE_MSK      (1 << 4)
+#define ALTERA_SPI_STATUS_TMT_MSK      (1 << 5)
+#define ALTERA_SPI_STATUS_TRDY_MSK     (1 << 6)
+#define ALTERA_SPI_STATUS_RRDY_MSK     (1 << 7)
+#define ALTERA_SPI_STATUS_E_MSK                (1 << 8)
 
-#define ALTERA_SPI_CONTROL_IROE_MSK    (0x8)
-#define ALTERA_SPI_CONTROL_ITOE_MSK    (0x10)
-#define ALTERA_SPI_CONTROL_ITRDY_MSK   (0x40)
-#define ALTERA_SPI_CONTROL_IRRDY_MSK   (0x80)
-#define ALTERA_SPI_CONTROL_IE_MSK      (0x100)
-#define ALTERA_SPI_CONTROL_SSO_MSK     (0x400)
-
-#ifndef CONFIG_SYS_ALTERA_SPI_LIST
-#define CONFIG_SYS_ALTERA_SPI_LIST { CONFIG_SYS_SPI_BASE }
-#endif
+#define ALTERA_SPI_CONTROL_IROE_MSK    (1 << 3)
+#define ALTERA_SPI_CONTROL_ITOE_MSK    (1 << 4)
+#define ALTERA_SPI_CONTROL_ITRDY_MSK   (1 << 6)
+#define ALTERA_SPI_CONTROL_IRRDY_MSK   (1 << 7)
+#define ALTERA_SPI_CONTROL_IE_MSK      (1 << 8)
+#define ALTERA_SPI_CONTROL_SSO_MSK     (1 << 10)
 
 static ulong altera_spi_base_list[] = CONFIG_SYS_ALTERA_SPI_LIST;
 
@@ -47,22 +51,19 @@ struct altera_spi_slave {
 };
 #define to_altera_spi_slave(s) container_of(s, struct altera_spi_slave, slave)
 
-__attribute__((weak))
-int spi_cs_is_valid(unsigned int bus, unsigned int cs)
+__weak int spi_cs_is_valid(unsigned int bus, unsigned int cs)
 {
        return bus < ARRAY_SIZE(altera_spi_base_list) && cs < 32;
 }
 
-__attribute__((weak))
-void spi_cs_activate(struct spi_slave *slave)
+__weak void spi_cs_activate(struct spi_slave *slave)
 {
        struct altera_spi_slave *altspi = to_altera_spi_slave(slave);
        writel(1 << slave->cs, &altspi->regs->slave_sel);
        writel(ALTERA_SPI_CONTROL_SSO_MSK, &altspi->regs->control);
 }
 
-__attribute__((weak))
-void spi_cs_deactivate(struct spi_slave *slave)
+__weak void spi_cs_deactivate(struct spi_slave *slave)
 {
        struct altera_spi_slave *altspi = to_altera_spi_slave(slave);
        writel(0, &altspi->regs->control);
@@ -91,8 +92,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
                return NULL;
 
        altspi->regs = (struct altera_spi_regs *)altera_spi_base_list[bus];
-       debug("%s: bus:%i cs:%i base:%p\n", __func__,
-               bus, cs, altspi->regs);
+       debug("%s: bus:%i cs:%i base:%p\n", __func__, bus, cs, altspi->regs);
 
        return &altspi->slave;
 }
@@ -121,21 +121,19 @@ 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);
+             slave->bus, slave->cs, bitlen, bytes, flags);
+
        if (bitlen == 0)
                goto done;
 
@@ -147,21 +145,38 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
        /* empty read buffer */
        if (readl(&altspi->regs->status) & ALTERA_SPI_STATUS_RRDY_MSK)
                readl(&altspi->regs->rxdata);
+
        if (flags & SPI_XFER_BEGIN)
                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;
-               debug("rx:%x\n", d);
+                       *rxp++ = data & 0xff;
+
+               debug("rx:%x\n", data);
        }
- done:
+
+done:
        if (flags & SPI_XFER_END)
                spi_cs_deactivate(slave);