Merge branch 'master' of /home/stefan/git/u-boot/u-boot

[platform/kernel/u-boot.git] / include / spi.h

diff --git a/include/spi.h b/include/spi.h
index 03dc5bc..3a55a68 100644 (file)
--- a/include/spi.h
+++ b/include/spi.h
@@ -24,6 +24,18 @@
 #ifndef _SPI_H_
 #define _SPI_H_
 
+/* SPI mode flags */
+#define        SPI_CPHA        0x01                    /* clock phase */
+#define        SPI_CPOL        0x02                    /* clock polarity */
+#define        SPI_MODE_0      (0|0)                   /* (original MicroWire) */
+#define        SPI_MODE_1      (0|SPI_CPHA)
+#define        SPI_MODE_2      (SPI_CPOL|0)
+#define        SPI_MODE_3      (SPI_CPOL|SPI_CPHA)
+#define        SPI_CS_HIGH     0x04                    /* chipselect active high? */
+#define        SPI_LSB_FIRST   0x08                    /* per-word bits-on-wire */
+#define        SPI_3WIRE       0x10                    /* SI/SO signals shared */
+#define        SPI_LOOP        0x20                    /* loopback mode */
+
 /*
  * The function call pointer type used to drive the chip select.
  */
@@ -68,6 +80,8 @@ void spi_init(void);
  *
  *   Returns: 0 on success, not 0 on failure
  */
-int  spi_xfer(spi_chipsel_type chipsel, int bitlen, uchar *dout, uchar *din);
+int spi_xfer(spi_chipsel_type chipsel, int bitlen, uchar *dout, uchar *din);
+
+int spi_select(unsigned int bus, unsigned int dev, unsigned long mode);
 
 #endif /* _SPI_H_ */