Merge branch 'karo-tx-uboot' into kc-merge

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

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index ea39d1a1eea628fe54a8cd92dd05f23e34ea92fc..7d81fbd7f8f52c31dd9503241e721c9ec8ce6bd8 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -5,9 +5,22 @@
  */
 
 #include <common.h>
+#include <fdtdec.h>
 #include <malloc.h>
 #include <spi.h>
 
+int spi_set_wordlen(struct spi_slave *slave, unsigned int wordlen)
+{
+       if (wordlen == 0 || wordlen > 32) {
+               printf("spi: invalid wordlen %d\n", wordlen);
+               return -1;
+       }
+
+       slave->wordlen = wordlen;
+
+       return 0;
+}
+
 void *spi_do_alloc_slave(int offset, int size, unsigned int bus,
                         unsigned int cs)
 {
@@ -20,7 +33,28 @@ void *spi_do_alloc_slave(int offset, int size, unsigned int bus,
                slave = (struct spi_slave *)(ptr + offset);
                slave->bus = bus;
                slave->cs = cs;
+               slave->wordlen = SPI_DEFAULT_WORDLEN;
        }
 
        return ptr;
 }
+
+#ifdef CONFIG_OF_SPI
+struct spi_slave *spi_base_setup_slave_fdt(const void *blob, int busnum,
+                                          int node)
+{
+       int cs, max_hz, mode = 0;
+
+       cs = fdtdec_get_int(blob, node, "reg", -1);
+       max_hz = fdtdec_get_int(blob, node, "spi-max-frequency", 100000);
+       if (fdtdec_get_bool(blob, node, "spi-cpol"))
+               mode |= SPI_CPOL;
+       if (fdtdec_get_bool(blob, node, "spi-cpha"))
+               mode |= SPI_CPHA;
+       if (fdtdec_get_bool(blob, node, "spi-cs-high"))
+               mode |= SPI_CS_HIGH;
+       if (fdtdec_get_bool(blob, node, "spi-half-duplex"))
+               mode |= SPI_PREAMBLE;
+       return spi_setup_slave(busnum, cs, max_hz, mode);
+}
+#endif